-
Remote Backups
-This feature can import website(s) from remote server
+{% trans "Remote Backups" %}
+{% trans "This feature can import website(s) from remote server" %}
- Remote Backups 
+ {% trans "Remote Backups" %}
@@ -24,7 +26,7 @@
diff --git a/backup/views.py b/backup/views.py
index 83e209be9..c0d1ff2c3 100644
--- a/backup/views.py
+++ b/backup/views.py
@@ -7,7 +7,7 @@ from django.http import HttpResponse
from .models import DBUsers
from loginSystem.models import Administrator
import json
-from websiteFunctions.models import Websites,Backups,dest,backupSchedules
+from websiteFunctions.models import Websites,Backups,dest,backupSchedules,ChildDomains
import plogical.CyberCPLogFileWriter as logging
from loginSystem.views import loadLoginPage
import os
@@ -187,10 +187,19 @@ def submitBackupCreation(request):
metaFile = open(meta, 'w')
- metaFile.write(backupDomain + "\n")
+ metaFile.write(backupDomain + "-" + website.phpSelection + "\n")
+
+ childDomains = website.childdomains_set.all()
databases = website.databases_set.all()
+ metaFile.write("Child Domains\n")
+
+ for items in childDomains:
+ metaFile.write(items.domain + "-" + items.phpSelection + "-" + items.path + "\n")
+
+ metaFile.write("Databases\n")
+
for items in databases:
dbuser = DBUsers.objects.get(user=items.dbUser)
metaFile.write(items.dbName + "-" + items.dbUser + "-" + dbuser.password + "\n")
@@ -422,10 +431,10 @@ def restoreStatus(request):
data = json.loads(request.body)
backupFile = data['backupFile'].strip(".tar.gz")
- path = "/home/backup/" + backupFile
+ path = "/home/backup/" + data['backupFile']
if os.path.exists(path):
- pass
+ path = "/home/backup/" + backupFile
else:
dir = data['dir']
path = "/home/backup/transfer-" + str(dir) + "/" + backupFile
@@ -1055,6 +1064,15 @@ def submitRemoteBackups(request):
pathToSSH = "/root/.ssh/authorized_keys"
+ if not os.path.exists("/root/.ssh"):
+ os.makedirs("/root/.ssh")
+ if not os.path.exists(pathToSSH):
+ f = open(pathToSSH,"w")
+ f.close()
+ else:
+ if not os.path.exists(pathToSSH):
+ f = open(pathToSSH,"w")
+ f.close()
presenseCheck = 0
@@ -1091,7 +1109,7 @@ def submitRemoteBackups(request):
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.", "dir": "Null"}
+ 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)
@@ -1125,16 +1143,20 @@ def starRemoteTransfer(request):
data = json.loads(r.text)
- localStoragePath = "/home/backup/transfer-"+str(data['dir'])
-
- if not os.path.exists(localStoragePath):
- os.makedirs(localStoragePath)
if data['transferStatus'] == 1:
+
+ ## create local directory that will host backups
+
+ localStoragePath = "/home/backup/transfer-" + str(data['dir'])
+
+ 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': data['error_message']})
+ 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:
@@ -1154,7 +1176,7 @@ def getRemoteTransferStatus(request):
username = "admin"
finalData = json.dumps({'dir': dir, "username":username,"password":password})
- r = requests.post("https://"+ipAddress+":8090/api/FetchRemoteTransferStatus", data=finalData)
+ r = requests.post("https://"+ipAddress+":8090/api/FetchRemoteTransferStatus", data=finalData,verify=False)
data = json.loads(r.text)
@@ -1265,7 +1287,7 @@ def cancelRemoteBackup(request):
finalData = json.dumps({'dir': dir, "username":username,"password":password})
- r = requests.post("https://"+ipAddress+":8090/api/cancelRemoteTransfer", data=finalData)
+ r = requests.post("https://"+ipAddress+":8090/api/cancelRemoteTransfer", data=finalData,verify=False)
data = json.loads(r.text)
diff --git a/baseTemplate/static/baseTemplate/custom-js/system-status.js b/baseTemplate/static/baseTemplate/custom-js/system-status.js
index 0e1acce2e..899b204ed 100644
--- a/baseTemplate/static/baseTemplate/custom-js/system-status.js
+++ b/baseTemplate/static/baseTemplate/custom-js/system-status.js
@@ -124,6 +124,11 @@ app.controller('adminController', function($scope,$http,$timeout) {
$("#backupDestinations").hide();
$("#scheduleBackup").hide();
+ $("#remoteBackups").hide();
+ $("#packageHome").hide();
+ $("#packageSub").hide();
+ $("#createWebsite").hide();
+
}
}
diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html
index 9bd31ea9c..a19e8f345 100755
--- a/baseTemplate/templates/baseTemplate/index.html
+++ b/baseTemplate/templates/baseTemplate/index.html
@@ -448,7 +448,7 @@
+ {% trans "Password changed for: " %} {$ dbUsername $}
-
diff --git a/firewall/templates/firewall/secureSSH.html b/firewall/templates/firewall/secureSSH.html
index 69fa28489..35099113c 100644
--- a/firewall/templates/firewall/secureSSH.html
+++ b/firewall/templates/firewall/secureSSH.html
@@ -11,7 +11,7 @@
{% trans "Cannot change password for " %}{$ dbUsername $}, Error message: {$ errorMessage $}
+{% trans "Cannot change password for " %}{$ dbUsername $}, {% trans "Error message:" %} {$ errorMessage $}
{% trans "Secure SSH" %}
-{% trans "Edit PHP Configurations on this page." %}
+{% trans "Secure or harden SSH Configurations." %}
diff --git a/locale/br/LC_MESSAGES/django.mo b/locale/br/LC_MESSAGES/django.mo
index ba8f25d3e..579a7e934 100644
Binary files a/locale/br/LC_MESSAGES/django.mo and b/locale/br/LC_MESSAGES/django.mo differ
diff --git a/locale/br/LC_MESSAGES/django.po b/locale/br/LC_MESSAGES/django.po
index 50adcd667..b8b3e1399 100644
--- a/locale/br/LC_MESSAGES/django.po
+++ b/locale/br/LC_MESSAGES/django.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-25 01:02+0500\n"
+"POT-Creation-Date: 2017-10-29 20:47+0500\n"
"PO-Revision-Date: 2017-10-24 22:23+0300\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -30,26 +30,22 @@ msgid "English"
msgstr ""
#: CyberCP/settings.py:168
-msgid "Urdu"
-msgstr ""
-
-#: CyberCP/settings.py:169
msgid "Chinese"
msgstr ""
-#: CyberCP/settings.py:170
+#: CyberCP/settings.py:169
msgid "Bulgarian"
msgstr ""
-#: CyberCP/settings.py:171
+#: CyberCP/settings.py:170
msgid "Portuguese"
msgstr ""
-#: CyberCP/settings.py:172
+#: CyberCP/settings.py:171
msgid "Japanese"
msgstr ""
-#: CyberCP/settings.py:173
+#: CyberCP/settings.py:172
msgid "Bosnian"
msgstr ""
@@ -117,7 +113,7 @@ msgstr "Откажи Архив"
#: backup/templates/backup/backup.html:101
#: backup/templates/backup/backupDestinations.html:90
#: backup/templates/backup/backupSchedule.html:89
-#: databases/templates/databases/listDataBases.html:86
+#: databases/templates/databases/listDataBases.html:87
#: dns/templates/dns/addDeleteDNSRecords.html:129
#: firewall/templates/firewall/firewall.html:127
#: ftp/templates/ftp/listFTPAccounts.html:87
@@ -144,6 +140,7 @@ msgstr "Размер"
#: dns/templates/dns/addDeleteDNSRecords.html:134
#: firewall/templates/firewall/firewall.html:131
#: firewall/templates/firewall/secureSSH.html:122
+#: websiteFunctions/templates/websiteFunctions/website.html:424
msgid "Delete"
msgstr "Изтрий"
@@ -166,6 +163,7 @@ msgid "On this page you can set up your Back up destinations. (SFTP)"
msgstr "От тази страница може да настройте дестинацията за архивите (SFTP)"
#: backup/templates/backup/backupDestinations.html:30
+#: backup/templates/backup/remoteBackups.html:29
#: dns/templates/dns/addDeleteDNSRecords.html:60
#: dns/templates/dns/createNameServer.html:48
#: dns/templates/dns/createNameServer.html:65
@@ -173,8 +171,9 @@ msgid "IP Address"
msgstr "IP Адрес"
#: backup/templates/backup/backupDestinations.html:38
+#: backup/templates/backup/remoteBackups.html:37
#: databases/templates/databases/createDatabase.html:58
-#: databases/templates/databases/listDataBases.html:89
+#: databases/templates/databases/listDataBases.html:90
#: ftp/templates/ftp/listFTPAccounts.html:91
#: mailServer/templates/mailServer/changeEmailPassword.html:52
#: mailServer/templates/mailServer/createEmailAccount.html:51
@@ -227,10 +226,12 @@ msgstr "Дестинацията е добавена"
#: userManagment/templates/userManagment/modifyUser.html:139
#: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:77
#: websiteFunctions/templates/websiteFunctions/website.html:157
-#: websiteFunctions/templates/websiteFunctions/website.html:284
-#: websiteFunctions/templates/websiteFunctions/website.html:339
-#: websiteFunctions/templates/websiteFunctions/website.html:394
-#: websiteFunctions/templates/websiteFunctions/website.html:542
+#: 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
msgid "Could not connect to server. Please refresh this page."
msgstr ""
@@ -335,12 +336,74 @@ msgstr "Възстанови Архив"
msgid "Restore"
msgstr "Възстанови"
-#: backup/templates/backup/remoteBackups.html:75
+#: backup/templates/backup/remoteBackups.html:3
+#, fuzzy
+#| msgid "Create Nameserver - CyberPanel"
+msgid "Transfer Websites from Remote Server - CyberPanel"
+msgstr "Създай Nameserver - CyberPanel"
+
+#: backup/templates/backup/remoteBackups.html:14
+#: backup/templates/backup/remoteBackups.html:21
+#, fuzzy
+#| msgid "Restore Back up"
+msgid "Remote Backups"
+msgstr "Възстанови Архив"
+
+#: backup/templates/backup/remoteBackups.html:15
+msgid "This feature can import website(s) from remote server"
+msgstr ""
+
+#: backup/templates/backup/remoteBackups.html:46
+#, fuzzy
+#| msgid "FTP Accounts"
+msgid "Fetch Accounts"
+msgstr "FTP Акаунти"
+
+#: backup/templates/backup/remoteBackups.html:55
+msgid "Start Transfer"
+msgstr ""
+
+#: backup/templates/backup/remoteBackups.html:59
+#: websiteFunctions/templates/websiteFunctions/website.html:269
+#, fuzzy
+#| msgid "Cancel Backup"
+msgid "Cancel"
+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
+msgid "Accounts Successfully Fetched from remote server."
+msgstr ""
+
+#: backup/templates/backup/remoteBackups.html:80
+#, fuzzy
+#| msgid " is successfully created."
+msgid "Backup Process successfully started."
+msgstr "е успешно създаден."
+
+#: backup/templates/backup/remoteBackups.html:84
+#, fuzzy
+#| msgid "Rule successfully added."
+msgid "Backup successfully cancelled."
+msgstr "Правилата са успешно добавени."
+
+#: backup/templates/backup/remoteBackups.html:96
+#, fuzzy
+#| msgid "Select Account"
+msgid "Search Accounts.."
+msgstr "Избери Акаунт"
+
+#: backup/templates/backup/remoteBackups.html:107
#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:65
msgid "Website"
msgstr "Страница"
-#: backup/templates/backup/remoteBackups.html:76
+#: backup/templates/backup/remoteBackups.html:108
#: baseTemplate/templates/baseTemplate/homePage.html:331
#: baseTemplate/templates/baseTemplate/index.html:625
#: baseTemplate/templates/baseTemplate/index.html:627
@@ -348,14 +411,14 @@ msgstr "Страница"
msgid "PHP"
msgstr "PHP"
-#: backup/templates/backup/remoteBackups.html:77
-#: packages/templates/packages/createPackage.html:91
+#: backup/templates/backup/remoteBackups.html:109
+#: packages/templates/packages/createPackage.html:99
#: packages/templates/packages/deletePackage.html:63
-#: packages/templates/packages/modifyPackage.html:102
+#: packages/templates/packages/modifyPackage.html:112
msgid "Package"
msgstr "Пакети"
-#: backup/templates/backup/remoteBackups.html:78
+#: backup/templates/backup/remoteBackups.html:110
#: baseTemplate/templates/baseTemplate/index.html:514
#: baseTemplate/templates/baseTemplate/index.html:516
#: userManagment/templates/userManagment/createUser.html:47
@@ -366,10 +429,6 @@ msgstr "Пакети"
msgid "Email"
msgstr "Email"
-#: backup/templates/backup/remoteBackups.html:79
-msgid "Transfer"
-msgstr ""
-
#: backup/templates/backup/restore.html:3
msgid "Restore Website - CyberPanel"
msgstr "Възстанови Страница - CyberPanel"
@@ -392,6 +451,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
#: managePHP/templates/managePHP/editPHPConfig.html:212
msgid "Error message:"
@@ -495,8 +555,8 @@ msgstr "Функции на Бази от Данни"
#: baseTemplate/templates/baseTemplate/index.html:477
#: baseTemplate/templates/baseTemplate/index.html:478
#: baseTemplate/templates/baseTemplate/index.html:479
-#: packages/templates/packages/createPackage.html:59
-#: packages/templates/packages/modifyPackage.html:63
+#: packages/templates/packages/createPackage.html:67
+#: packages/templates/packages/modifyPackage.html:73
#: websiteFunctions/templates/websiteFunctions/website.html:44
msgid "Databases"
msgstr "База от Данни"
@@ -527,8 +587,8 @@ msgstr "FTP"
#: baseTemplate/templates/baseTemplate/homePage.html:278
#: baseTemplate/templates/baseTemplate/homePage.html:281
-#: packages/templates/packages/createPackage.html:67
-#: packages/templates/packages/modifyPackage.html:70
+#: packages/templates/packages/createPackage.html:75
+#: packages/templates/packages/modifyPackage.html:80
msgid "Emails"
msgstr "Emails"
@@ -716,7 +776,7 @@ msgstr "Изтрий Страница"
#: baseTemplate/templates/baseTemplate/index.html:468
#: packages/templates/packages/createPackage.html:13
-#: packages/templates/packages/createPackage.html:76
+#: packages/templates/packages/createPackage.html:84
#: packages/templates/packages/index.html:25
#: packages/templates/packages/index.html:27
msgid "Create Package"
@@ -736,7 +796,7 @@ msgstr "Изтрий Пакет"
#: packages/templates/packages/index.html:51
#: packages/templates/packages/modifyPackage.html:9
#: packages/templates/packages/modifyPackage.html:15
-#: packages/templates/packages/modifyPackage.html:85
+#: packages/templates/packages/modifyPackage.html:95
msgid "Modify Package"
msgstr "Промени Пакет"
@@ -827,7 +887,7 @@ msgid "Delete Email"
msgstr "Изтрий Email"
#: baseTemplate/templates/baseTemplate/index.html:523
-#: databases/templates/databases/listDataBases.html:72
+#: databases/templates/databases/listDataBases.html:73
#: ftp/templates/ftp/listFTPAccounts.html:73
#: mailServer/templates/mailServer/changeEmailPassword.html:64
#: mailServer/templates/mailServer/index.html:49
@@ -843,7 +903,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:461
+#: websiteFunctions/templates/websiteFunctions/website.html:683
+#: websiteFunctions/templates/websiteFunctions/website.html:685
msgid "Create FTP Account"
msgstr "Създай FTP Акаунт"
@@ -852,7 +913,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:473
+#: websiteFunctions/templates/websiteFunctions/website.html:695
+#: websiteFunctions/templates/websiteFunctions/website.html:697
msgid "Delete FTP Account"
msgstr "Изтрий FTP Акаунт"
@@ -1042,7 +1104,7 @@ msgid "Create a new database on this page."
msgstr "Създай нова база от данни от тази страница."
#: databases/templates/databases/createDatabase.html:42
-#: databases/templates/databases/listDataBases.html:87
+#: databases/templates/databases/listDataBases.html:88
msgid "Database Name"
msgstr "Име на База от Данни"
@@ -1107,21 +1169,25 @@ msgstr "Избери Домейн"
msgid "Records successfully fetched for"
msgstr ""
-#: databases/templates/databases/listDataBases.html:53
+#: databases/templates/databases/listDataBases.html:50
+msgid "Password changed for: "
+msgstr ""
+
+#: databases/templates/databases/listDataBases.html:54
msgid "Cannot change password for "
msgstr ""
-#: databases/templates/databases/listDataBases.html:58
+#: databases/templates/databases/listDataBases.html:59
#: firewall/templates/firewall/firewall.html:166
#: ftp/templates/ftp/listFTPAccounts.html:59
msgid "Could Not Connect to server. Please refresh this page"
msgstr ""
-#: databases/templates/databases/listDataBases.html:88
+#: databases/templates/databases/listDataBases.html:89
msgid "Database User"
msgstr ""
-#: databases/templates/databases/listDataBases.html:97
+#: databases/templates/databases/listDataBases.html:98
#: ftp/templates/ftp/listFTPAccounts.html:100
msgid "Change"
msgstr "Промени"
@@ -1164,6 +1230,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
msgid "Domain Name"
msgstr "Домейн Име"
@@ -1386,9 +1453,10 @@ msgid "Secure SSH - CyberPanel"
msgstr ""
#: firewall/templates/firewall/secureSSH.html:14
-#: managePHP/templates/managePHP/editPHPConfig.html:15
-msgid "Edit PHP Configurations on this page."
-msgstr ""
+#, fuzzy
+#| msgid "SSH Configurations Saved."
+msgid "Secure or harden SSH Configurations."
+msgstr "SSH Конфигурацията е запаметена."
#: firewall/templates/firewall/secureSSH.html:28
#: managePHP/templates/managePHP/editPHPConfig.html:29
@@ -1433,8 +1501,8 @@ msgstr "Добави Ключ"
#: firewall/templates/firewall/secureSSH.html:158
#: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:55
-#: websiteFunctions/templates/websiteFunctions/website.html:303
-#: websiteFunctions/templates/websiteFunctions/website.html:363
+#: websiteFunctions/templates/websiteFunctions/website.html:527
+#: websiteFunctions/templates/websiteFunctions/website.html:587
msgid "Save"
msgstr "Запази"
@@ -1623,6 +1691,10 @@ msgstr "Редактирай PHP Конфигурация - CyberPanel"
msgid "Edit PHP Configurations"
msgstr "Редактирай PHP Конфигурация"
+#: managePHP/templates/managePHP/editPHPConfig.html:15
+msgid "Edit PHP Configurations on this page."
+msgstr ""
+
#: managePHP/templates/managePHP/editPHPConfig.html:35
msgid "Advanced"
msgstr "За Напреднали"
@@ -1633,6 +1705,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
msgid "Select PHP"
msgstr "Избери PHP"
@@ -1811,32 +1884,47 @@ msgid "Package Name"
msgstr "Име на Пакет"
#: packages/templates/packages/createPackage.html:35
-#: packages/templates/packages/modifyPackage.html:39
+#: packages/templates/packages/modifyPackage.html:40
+#: websiteFunctions/templates/websiteFunctions/website.html:223
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Domains"
+msgstr "Домейн Име"
+
+#: packages/templates/packages/createPackage.html:39
+#: packages/templates/packages/modifyPackage.html:44
+#, fuzzy
+#| msgid "( 0 = Unlimited )"
+msgid "(0 = Unlimited)"
+msgstr "( 0 = Без Лимит )"
+
+#: packages/templates/packages/createPackage.html:43
+#: packages/templates/packages/modifyPackage.html:49
msgid "Disk Space"
msgstr "Дисково Място"
-#: packages/templates/packages/createPackage.html:39
#: packages/templates/packages/createPackage.html:47
-#: packages/templates/packages/modifyPackage.html:43
-#: packages/templates/packages/modifyPackage.html:51
+#: packages/templates/packages/createPackage.html:55
+#: packages/templates/packages/modifyPackage.html:53
+#: packages/templates/packages/modifyPackage.html:61
msgid "MB (0 = Unlimited)"
msgstr "MB (0 = Без лимит)"
-#: packages/templates/packages/createPackage.html:43
-#: packages/templates/packages/modifyPackage.html:47
+#: packages/templates/packages/createPackage.html:51
+#: packages/templates/packages/modifyPackage.html:57
msgid "Bandwidth"
msgstr "Трафик"
-#: packages/templates/packages/createPackage.html:52
-#: packages/templates/packages/modifyPackage.html:56
+#: packages/templates/packages/createPackage.html:60
+#: packages/templates/packages/modifyPackage.html:66
msgid "FTP Accounts"
msgstr "FTP Акаунти"
-#: packages/templates/packages/createPackage.html:87
+#: packages/templates/packages/createPackage.html:95
msgid "Cannot create package. Error message:"
msgstr "Пакета не е създаден, защото:"
-#: packages/templates/packages/createPackage.html:91
+#: packages/templates/packages/createPackage.html:99
msgid "Successfully Created"
msgstr "Успешно е създаден"
@@ -1868,15 +1956,15 @@ msgstr "Пакети - CyberPanel"
msgid "Modify Package - CyberPanel"
msgstr "Промени Пакет - CyberPanel"
-#: packages/templates/packages/modifyPackage.html:94
+#: packages/templates/packages/modifyPackage.html:104
msgid "Cannot fetch package details. Error message:"
msgstr "Детайлите за пакета не са извлечени, защото:"
-#: packages/templates/packages/modifyPackage.html:98
+#: packages/templates/packages/modifyPackage.html:108
msgid "Package Details Successfully Fetched"
msgstr "Детайлите за пакета са успешно извлечени"
-#: packages/templates/packages/modifyPackage.html:102
+#: packages/templates/packages/modifyPackage.html:112
msgid "Successfully Modified"
msgstr "Успешно Променено"
@@ -2377,29 +2465,36 @@ msgid "Select Owner"
msgstr "Избери Собственик"
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:56
+#: websiteFunctions/templates/websiteFunctions/website.html:267
+#: websiteFunctions/templates/websiteFunctions/website.html:278
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
msgid "Additional Features"
msgstr "Допълнителни функции"
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:91
+#: websiteFunctions/templates/websiteFunctions/website.html:306
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
msgid "Cannot create website. Error message:"
msgstr "Страницата не е създадена, защото:"
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:117
+#: websiteFunctions/templates/websiteFunctions/website.html:332
msgid "Website with domain"
msgstr "Страница с домейн"
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:117
+#: websiteFunctions/templates/websiteFunctions/website.html:332
msgid " is Successfully Created"
msgstr "е Успешно Създаден"
@@ -2542,95 +2637,159 @@ msgstr "Следваща"
msgid "Previous"
msgstr "Минала"
-#: websiteFunctions/templates/websiteFunctions/website.html:227
+#: websiteFunctions/templates/websiteFunctions/website.html:230
+#: websiteFunctions/templates/websiteFunctions/website.html:232
+#, fuzzy
+#| msgid "Add Destination"
+msgid "Add Domains"
+msgstr "Добави дестинация"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:242
+#: websiteFunctions/templates/websiteFunctions/website.html:244
+#, fuzzy
+#| msgid "Select Domain"
+msgid "List Domains"
+msgstr "Избери Домейн"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:274
+#: websiteFunctions/templates/websiteFunctions/website.html:733
+msgid "Path"
+msgstr "Път"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:276
+msgid "This path is relative to: "
+msgstr ""
+
+#: websiteFunctions/templates/websiteFunctions/website.html:276
+msgid "Leave empty to set default."
+msgstr ""
+
+#: websiteFunctions/templates/websiteFunctions/website.html:317
+#, fuzzy
+#| msgid "Create Email"
+msgid "Create Domain"
+msgstr "Създай Email"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:360
+#, fuzzy
+#| msgid "Version Management"
+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 издаден за"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:391
+msgid "Close"
+msgstr ""
+
+#: websiteFunctions/templates/websiteFunctions/website.html:423
+#, fuzzy
+#| msgid "Issue SSL"
+msgid "Issue"
+msgstr "Издаване на SSL"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:451
msgid "Configurations"
msgstr "Конфигурация"
-#: websiteFunctions/templates/websiteFunctions/website.html:233
+#: websiteFunctions/templates/websiteFunctions/website.html:457
msgid "Edit Virtual Host Main Configurations"
msgstr "Редактирай Virtual Host Main Configurations"
-#: websiteFunctions/templates/websiteFunctions/website.html:235
+#: websiteFunctions/templates/websiteFunctions/website.html:459
msgid "Edit vHost Main Configurations"
msgstr "Редактирай vHost Main Configurations"
-#: websiteFunctions/templates/websiteFunctions/website.html:245
-#: websiteFunctions/templates/websiteFunctions/website.html:247
+#: websiteFunctions/templates/websiteFunctions/website.html:469
+#: websiteFunctions/templates/websiteFunctions/website.html:471
msgid "Add Rewrite Rules (.htaccess)"
msgstr "Добави Rewrite Rules (.htaccess)"
-#: websiteFunctions/templates/websiteFunctions/website.html:257
+#: websiteFunctions/templates/websiteFunctions/website.html:481
msgid "Add Your Own SSL"
msgstr "Добави свой SSL"
-#: websiteFunctions/templates/websiteFunctions/website.html:259
+#: websiteFunctions/templates/websiteFunctions/website.html:483
msgid "Add SSL"
msgstr "Добави SSL"
-#: websiteFunctions/templates/websiteFunctions/website.html:274
+#: websiteFunctions/templates/websiteFunctions/website.html:498
msgid "SSL Saved"
msgstr "SSL Запазен"
-#: websiteFunctions/templates/websiteFunctions/website.html:279
+#: websiteFunctions/templates/websiteFunctions/website.html:503
msgid "Could not save SSL. Error message:"
msgstr "SSL не е запазен, защото:"
-#: websiteFunctions/templates/websiteFunctions/website.html:329
+#: websiteFunctions/templates/websiteFunctions/website.html:553
msgid "Current configuration in the file fetched."
msgstr "Текущата конфигурация във файла е изтеглена"
-#: websiteFunctions/templates/websiteFunctions/website.html:334
-#: websiteFunctions/templates/websiteFunctions/website.html:347
+#: websiteFunctions/templates/websiteFunctions/website.html:558
+#: websiteFunctions/templates/websiteFunctions/website.html:571
msgid "Could not fetch current configuration. Error message:"
msgstr "Текущата конфигурация не е изтеглена, защото:"
-#: websiteFunctions/templates/websiteFunctions/website.html:343
-#: websiteFunctions/templates/websiteFunctions/website.html:398
+#: websiteFunctions/templates/websiteFunctions/website.html:567
+#: websiteFunctions/templates/websiteFunctions/website.html:622
msgid "Configuration saved. Restart LiteSpeed put them in effect."
msgstr ""
"Конфигурацията е запазена. Рестартирайте LiteSpeed, за да влезнат в сила "
"промените."
-#: websiteFunctions/templates/websiteFunctions/website.html:384
+#: websiteFunctions/templates/websiteFunctions/website.html:608
msgid "Current rewrite rules in the file fetched."
msgstr "Наличните rewrite rules са изтеглени."
-#: websiteFunctions/templates/websiteFunctions/website.html:389
+#: websiteFunctions/templates/websiteFunctions/website.html:613
msgid "Could not fetch current rewrite rules. Error message:"
msgstr "Наличните rewrite rules не са изтеглени, защото:"
-#: websiteFunctions/templates/websiteFunctions/website.html:402
+#: websiteFunctions/templates/websiteFunctions/website.html:626
msgid "Could not save rewrite rules. Error message:"
msgstr "Новите rewrite rules не са запаметени, защото:"
-#: websiteFunctions/templates/websiteFunctions/website.html:418
+#: websiteFunctions/templates/websiteFunctions/website.html:642
msgid "Save Rewrite Rules"
msgstr "Запази Rewrite Rules"
-#: websiteFunctions/templates/websiteFunctions/website.html:441
+#: websiteFunctions/templates/websiteFunctions/website.html:665
msgid "Files"
msgstr "Файлове"
-#: websiteFunctions/templates/websiteFunctions/website.html:450
+#: websiteFunctions/templates/websiteFunctions/website.html:672
+#: websiteFunctions/templates/websiteFunctions/website.html:674
msgid "File Manager"
msgstr "Файл Мениджър"
-#: websiteFunctions/templates/websiteFunctions/website.html:490
+#: websiteFunctions/templates/websiteFunctions/website.html:713
msgid "Application Installer"
msgstr "Инсталатор на Приложения"
-#: websiteFunctions/templates/websiteFunctions/website.html:498
+#: websiteFunctions/templates/websiteFunctions/website.html:719
+#, fuzzy
+#| msgid "Wordpress with LSCache"
+msgid "Install wordpress with LSCache"
+msgstr "Wordpress с LSCache"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:721
msgid "Wordpress with LSCache"
msgstr "Wordpress с LSCache"
-#: websiteFunctions/templates/websiteFunctions/website.html:510
-msgid "Path"
-msgstr "Път"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:532
+#: websiteFunctions/templates/websiteFunctions/website.html:755
msgid "Installation failed. Error message:"
msgstr "Инсталацията Не завърши, защото:"
-#: websiteFunctions/templates/websiteFunctions/website.html:536
+#: websiteFunctions/templates/websiteFunctions/website.html:759
msgid "Installation successful. To complete the setup visit:"
msgstr "Инсталацията завърши успешно. "
diff --git a/locale/bs/LC_MESSAGES/django.mo b/locale/bs/LC_MESSAGES/django.mo
index 2c5c17dea..b469df885 100644
Binary files a/locale/bs/LC_MESSAGES/django.mo and b/locale/bs/LC_MESSAGES/django.mo differ
diff --git a/locale/bs/LC_MESSAGES/django.po b/locale/bs/LC_MESSAGES/django.po
index e7eb76929..c6431ac51 100644
--- a/locale/bs/LC_MESSAGES/django.po
+++ b/locale/bs/LC_MESSAGES/django.po
@@ -3,19 +3,27 @@
# This file is distributed under the same license as the CyberPanel package.
# FIRST AUTHOR , 2017.
#
+#: baseTemplate/templates/baseTemplate/index.html:211
+#: baseTemplate/templates/baseTemplate/index.html:301
+#: baseTemplate/templates/baseTemplate/index.html:356
+#: baseTemplate/templates/baseTemplate/index.html:362
+#: baseTemplate/templates/baseTemplate/index.html:368
+#: baseTemplate/templates/baseTemplate/index.html:374
+#: baseTemplate/templates/baseTemplate/index.html:380
+#: baseTemplate/templates/baseTemplate/index.html:386
msgid ""
msgstr ""
"Project-Id-Version: CyberPanel\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-19 17:34+0500\n"
-"PO-Revision-Date: 2017-10-22 23:56+0200\n"
+"POT-Creation-Date: 2017-10-29 20:47+0500\n"
+"PO-Revision-Date: 2017-10-21 21:00+0200\n"
+"Last-Translator: \n"
"Language-Team: LANGUAGE \n"
"Language: bs_BA\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Last-Translator: \n"
-"X-Generator: Poedit 2.0.4\n"
+"X-Generator: Poedit 2.0.1\n"
#: CyberCP/settings.py:167
msgid "English"
@@ -25,16 +33,32 @@ msgstr "Engleski"
msgid "Chinese"
msgstr "Kineski"
-#: backup/templates/backup/backup.html:3 backup/templates/backup/backup.html:14
-#: backup/templates/backup/backup.html:21
+#: CyberCP/settings.py:169
+msgid "Bulgarian"
+msgstr ""
+
+#: CyberCP/settings.py:170
+msgid "Portuguese"
+msgstr ""
+
+#: CyberCP/settings.py:171
+msgid "Japanese"
+msgstr ""
+
+#: CyberCP/settings.py:172
+msgid "Bosnian"
+msgstr ""
+
+#: backup/templates/backup/backup.html:3 backup/templates/backup/backup.html:13
+#: backup/templates/backup/backup.html:20
msgid "Back up Website"
msgstr "Nazad na sajt"
-#: backup/templates/backup/backup.html:15
+#: backup/templates/backup/backup.html:14
msgid "This page can be used to Back up your websites"
msgstr "Ova stranica može poslužiti da napravite Backup vašeg sajta"
-#: backup/templates/backup/backup.html:30
+#: backup/templates/backup/backup.html:29
#: databases/templates/databases/createDatabase.html:28
#: databases/templates/databases/deleteDatabase.html:28
#: ftp/templates/ftp/createFTPAccount.html:28
@@ -49,23 +73,23 @@ msgstr "Ova stranica može poslužiti da napravite Backup vašeg sajta"
msgid "Select Website"
msgstr "Odabir sajta"
-#: backup/templates/backup/backup.html:41
+#: backup/templates/backup/backup.html:40
#: backup/templates/backup/backupSchedule.html:90
msgid "Destination"
msgstr "Odredište"
-#: backup/templates/backup/backup.html:44
-#: baseTemplate/templates/baseTemplate/homePage.html:13
+#: backup/templates/backup/backup.html:43
+#: baseTemplate/templates/baseTemplate/homePage.html:12
msgid "Home"
msgstr "Početna"
-#: backup/templates/backup/backup.html:60
+#: backup/templates/backup/backup.html:59
#: backup/templates/backup/restore.html:62
msgid "File Name"
msgstr "Ime datoteke"
-#: backup/templates/backup/backup.html:61
-#: backup/templates/backup/backup.html:100
+#: backup/templates/backup/backup.html:60
+#: backup/templates/backup/backup.html:105
#: backup/templates/backup/restore.html:63
#: baseTemplate/templates/baseTemplate/index.html:390
#: firewall/templates/firewall/firewall.html:36
@@ -73,19 +97,25 @@ msgstr "Ime datoteke"
msgid "Status"
msgstr "Status"
-#: backup/templates/backup/backup.html:66
+#: backup/templates/backup/backup.html:65
msgid "Running"
msgstr "Pokrenuto"
-#: backup/templates/backup/backup.html:81
+#: backup/templates/backup/backup.html:80
#: baseTemplate/templates/baseTemplate/index.html:561
msgid "Create Back up"
msgstr "Kreiraj backup"
-#: backup/templates/backup/backup.html:96
+#: backup/templates/backup/backup.html:87
+#, fuzzy
+#| msgid "Create Back up"
+msgid "Cancel Backup"
+msgstr "Kreiraj backup"
+
+#: backup/templates/backup/backup.html:101
#: backup/templates/backup/backupDestinations.html:90
#: backup/templates/backup/backupSchedule.html:89
-#: databases/templates/databases/listDataBases.html:86
+#: databases/templates/databases/listDataBases.html:87
#: dns/templates/dns/addDeleteDNSRecords.html:129
#: firewall/templates/firewall/firewall.html:127
#: ftp/templates/ftp/listFTPAccounts.html:87
@@ -93,33 +123,34 @@ msgstr "Kreiraj backup"
msgid "ID"
msgstr "ID"
-#: backup/templates/backup/backup.html:97
+#: backup/templates/backup/backup.html:102
msgid "File"
msgstr "Datoteka"
-#: backup/templates/backup/backup.html:98
+#: backup/templates/backup/backup.html:103
msgid "Date"
msgstr "Datum"
-#: backup/templates/backup/backup.html:99
+#: backup/templates/backup/backup.html:104
#: ftp/templates/ftp/listFTPAccounts.html:90
msgid "Size"
msgstr "Veličina"
-#: backup/templates/backup/backup.html:101
+#: backup/templates/backup/backup.html:106
#: 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/secureSSH.html:122
+#: websiteFunctions/templates/websiteFunctions/website.html:424
msgid "Delete"
msgstr "Briši"
-#: backup/templates/backup/backup.html:125
+#: backup/templates/backup/backup.html:130
msgid "Cannot delete website, Error message: "
msgstr "Nije moguće izbisati web sajti, greška: "
-#: backup/templates/backup/backup.html:129
+#: backup/templates/backup/backup.html:134
msgid "Successfully Deleted"
msgstr "Uspješno izbrisan"
@@ -134,14 +165,17 @@ msgid "On this page you can set up your Back up destinations. (SFTP)"
msgstr "Na ovoj stranici možete podesiti Backup destinacije (SFTP)"
#: backup/templates/backup/backupDestinations.html:30
+#: backup/templates/backup/remoteBackups.html:29
+#: dns/templates/dns/addDeleteDNSRecords.html:60
#: dns/templates/dns/createNameServer.html:48
#: dns/templates/dns/createNameServer.html:65
msgid "IP Address"
msgstr "IP adresa"
#: backup/templates/backup/backupDestinations.html:38
+#: backup/templates/backup/remoteBackups.html:37
#: databases/templates/databases/createDatabase.html:58
-#: databases/templates/databases/listDataBases.html:89
+#: databases/templates/databases/listDataBases.html:90
#: ftp/templates/ftp/listFTPAccounts.html:91
#: mailServer/templates/mailServer/changeEmailPassword.html:52
#: mailServer/templates/mailServer/createEmailAccount.html:51
@@ -152,6 +186,7 @@ msgstr "Šifra"
#: backup/templates/backup/backupDestinations.html:48
#: backup/templates/backup/backupSchedule.html:54
+#: baseTemplate/templates/baseTemplate/index.html:563
msgid "Add Destination"
msgstr "Dodaj destinaciju"
@@ -193,10 +228,12 @@ msgstr "Destinacija je dodana."
#: userManagment/templates/userManagment/modifyUser.html:139
#: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:77
#: websiteFunctions/templates/websiteFunctions/website.html:157
-#: websiteFunctions/templates/websiteFunctions/website.html:284
-#: websiteFunctions/templates/websiteFunctions/website.html:339
-#: websiteFunctions/templates/websiteFunctions/website.html:394
-#: websiteFunctions/templates/websiteFunctions/website.html:542
+#: 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
msgid "Could not connect to server. Please refresh this page."
msgstr "Ne mogu se spojiti na udaljeni računar. Molimo da refreshujete "
@@ -261,8 +298,11 @@ 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:270
+#: baseTemplate/templates/baseTemplate/homePage.html:266
+#: baseTemplate/templates/baseTemplate/homePage.html:269
+#: baseTemplate/templates/baseTemplate/index.html:554
#: baseTemplate/templates/baseTemplate/index.html:556
+#: baseTemplate/templates/baseTemplate/index.html:572
msgid "Back up"
msgstr "Backup"
@@ -271,7 +311,7 @@ msgid "Back up and restore sites."
msgstr "Backup i vrati sajtove"
#: backup/templates/backup/index.html:19
-#: baseTemplate/templates/baseTemplate/homePage.html:165
+#: baseTemplate/templates/baseTemplate/homePage.html:164
#: databases/templates/databases/index.html:19 dns/templates/dns/index.html:19
#: firewall/templates/firewall/index.html:19 ftp/templates/ftp/index.html:19
#: mailServer/templates/mailServer/index.html:19
@@ -286,11 +326,115 @@ msgstr "Backup i vrati sajtove"
msgid "Available Functions"
msgstr "Dostupne funkcije"
+#: backup/templates/backup/index.html:27 backup/templates/backup/index.html:43
+#, fuzzy
+#| msgid "Back up Website"
+msgid "Back up Site"
+msgstr "Nazad na sajt"
+
+#: backup/templates/backup/index.html:55
+#: baseTemplate/templates/baseTemplate/index.html:562
+msgid "Restore Back up"
+msgstr "Vrati backup"
+
#: backup/templates/backup/index.html:57
#: backup/templates/backup/restore.html:45
msgid "Restore"
msgstr "Povrat"
+#: backup/templates/backup/remoteBackups.html:3
+#, fuzzy
+#| msgid "Create Nameserver - CyberPanel"
+msgid "Transfer Websites from Remote Server - CyberPanel"
+msgstr "Kreiraj Nameserver - CyberPanel"
+
+#: backup/templates/backup/remoteBackups.html:14
+#: backup/templates/backup/remoteBackups.html:21
+#, fuzzy
+#| msgid "Restore Back up"
+msgid "Remote Backups"
+msgstr "Vrati backup"
+
+#: backup/templates/backup/remoteBackups.html:15
+msgid "This feature can import website(s) from remote server"
+msgstr ""
+
+#: backup/templates/backup/remoteBackups.html:46
+#, fuzzy
+#| msgid "FTP Accounts"
+msgid "Fetch Accounts"
+msgstr "FTP računa"
+
+#: backup/templates/backup/remoteBackups.html:55
+msgid "Start Transfer"
+msgstr ""
+
+#: backup/templates/backup/remoteBackups.html:59
+#: websiteFunctions/templates/websiteFunctions/website.html:269
+msgid "Cancel"
+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 "Ne mogu se spojiti na udaljeni računar. Molimo da refreshujete"
+
+#: backup/templates/backup/remoteBackups.html:76
+#, fuzzy
+#| msgid "Records successfully fetched for"
+msgid "Accounts Successfully Fetched from remote server."
+msgstr "Zapisnici su uspješno dohvaćeni za"
+
+#: backup/templates/backup/remoteBackups.html:80
+#, fuzzy
+#| msgid " is successfully created."
+msgid "Backup Process successfully started."
+msgstr " uspješno je kreiran."
+
+#: backup/templates/backup/remoteBackups.html:84
+#, fuzzy
+#| msgid "is successfully created."
+msgid "Backup successfully cancelled."
+msgstr " je spješno kreiran. "
+
+#: backup/templates/backup/remoteBackups.html:96
+#, fuzzy
+#| msgid "Select Account"
+msgid "Search Accounts.."
+msgstr "Odaberite račun"
+
+#: backup/templates/backup/remoteBackups.html:107
+#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:65
+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
+#: managePHP/templates/managePHP/installExtensions.html:62
+msgid "PHP"
+msgstr "PHP"
+
+#: backup/templates/backup/remoteBackups.html:109
+#: packages/templates/packages/createPackage.html:99
+#: packages/templates/packages/deletePackage.html:63
+#: packages/templates/packages/modifyPackage.html:112
+msgid "Package"
+msgstr "Paket"
+
+#: backup/templates/backup/remoteBackups.html:110
+#: baseTemplate/templates/baseTemplate/index.html:514
+#: baseTemplate/templates/baseTemplate/index.html:516
+#: userManagment/templates/userManagment/createUser.html:47
+#: userManagment/templates/userManagment/modifyUser.html:54
+#: userManagment/templates/userManagment/userProfile.html:50
+#: websiteFunctions/templates/websiteFunctions/createWebsite.html:60
+#: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:67
+msgid "Email"
+msgstr "Email"
+
#: backup/templates/backup/restore.html:3
msgid "Restore Website - CyberPanel"
msgstr "Povrat sajta"
@@ -316,6 +460,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
#: managePHP/templates/managePHP/editPHPConfig.html:212
msgid "Error message:"
@@ -329,119 +474,166 @@ msgstr "Sajt povezan sa backupom već psotoji"
msgid "Home - CyberPanel"
msgstr "Početna - CyberPanel"
-#: baseTemplate/templates/baseTemplate/homePage.html:14
+#: baseTemplate/templates/baseTemplate/homePage.html:13
msgid "Use the tabs to navigate through the control panel."
msgstr "Koristi tabove da te vode do kontrolnog panela"
-#: baseTemplate/templates/baseTemplate/homePage.html:24
+#: baseTemplate/templates/baseTemplate/homePage.html:23
#: websiteFunctions/templates/websiteFunctions/website.html:33
msgid "Usage"
msgstr "Upotreba"
-#: baseTemplate/templates/baseTemplate/homePage.html:35
+#: baseTemplate/templates/baseTemplate/homePage.html:34
#: baseTemplate/templates/baseTemplate/index.html:221
msgid "CPU Usage"
msgstr "CPU Upotreba"
-#: baseTemplate/templates/baseTemplate/homePage.html:56
+#: baseTemplate/templates/baseTemplate/homePage.html:55
#: baseTemplate/templates/baseTemplate/index.html:232
msgid "Ram Usage"
msgstr "RAM Upotreba"
-#: baseTemplate/templates/baseTemplate/homePage.html:75
+#: baseTemplate/templates/baseTemplate/homePage.html:74
msgid "Disk Usage '/'"
msgstr "Upotreba diska '/'"
-#: baseTemplate/templates/baseTemplate/homePage.html:99
+#: baseTemplate/templates/baseTemplate/homePage.html:98
msgid "HTTP Statistics"
msgstr "HTTP Statistika"
-#: baseTemplate/templates/baseTemplate/homePage.html:108
+#: baseTemplate/templates/baseTemplate/homePage.html:107
msgid "Available/Max Connections"
msgstr "Dostupno/Max konekcija"
-#: baseTemplate/templates/baseTemplate/homePage.html:119
+#: baseTemplate/templates/baseTemplate/homePage.html:118
msgid "Available/Max SSL Connections"
msgstr "Dostupno/Max ssl konekcija"
-#: baseTemplate/templates/baseTemplate/homePage.html:128
+#: baseTemplate/templates/baseTemplate/homePage.html:127
msgid "Requests Processing"
msgstr "Obrada zahteva"
-#: baseTemplate/templates/baseTemplate/homePage.html:137
+#: baseTemplate/templates/baseTemplate/homePage.html:136
msgid "Total Requests"
msgstr "Ukupno zahtijeva"
-#: baseTemplate/templates/baseTemplate/homePage.html:177
+#: baseTemplate/templates/baseTemplate/homePage.html:173
+#: userManagment/templates/userManagment/index.html:13
+msgid "User Functions"
+msgstr "Korisničke funkcije"
+
+#: baseTemplate/templates/baseTemplate/homePage.html:176
+#: 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:190
+#: baseTemplate/templates/baseTemplate/homePage.html:186
+#: websiteFunctions/templates/websiteFunctions/index.html:13
+msgid "Website Functions"
+msgstr ""
+
+#: baseTemplate/templates/baseTemplate/homePage.html:189
#: baseTemplate/templates/baseTemplate/index.html:360
+#: baseTemplate/templates/baseTemplate/index.html:444
+#: baseTemplate/templates/baseTemplate/index.html:445
#: baseTemplate/templates/baseTemplate/index.html:446
#: websiteFunctions/templates/websiteFunctions/listWebsites.html:21
msgid "Websites"
msgstr "Sajtovi"
-#: baseTemplate/templates/baseTemplate/homePage.html:203
+#: baseTemplate/templates/baseTemplate/homePage.html:199
+#, fuzzy
+#| msgid "Modify Package"
+msgid "Add/Modify Packages"
+msgstr "Promijeni paket"
+
+#: baseTemplate/templates/baseTemplate/homePage.html:202
#: baseTemplate/templates/baseTemplate/index.html:366
+#: baseTemplate/templates/baseTemplate/index.html:461
#: baseTemplate/templates/baseTemplate/index.html:463
#: packages/templates/packages/index.html:13
msgid "Packages"
msgstr "Pakti"
-#: baseTemplate/templates/baseTemplate/homePage.html:227
+#: baseTemplate/templates/baseTemplate/homePage.html:223
+#: databases/templates/databases/index.html:12
+msgid "Database Functions"
+msgstr "Funkcije za bazu podataka"
+
+#: baseTemplate/templates/baseTemplate/homePage.html:226
+#: baseTemplate/templates/baseTemplate/index.html:477
+#: baseTemplate/templates/baseTemplate/index.html:478
#: baseTemplate/templates/baseTemplate/index.html:479
-#: packages/templates/packages/createPackage.html:59
-#: packages/templates/packages/modifyPackage.html:63
+#: packages/templates/packages/createPackage.html:67
+#: packages/templates/packages/modifyPackage.html:73
#: websiteFunctions/templates/websiteFunctions/website.html:44
msgid "Databases"
msgstr "Baze podataka"
-#: baseTemplate/templates/baseTemplate/homePage.html:239
+#: baseTemplate/templates/baseTemplate/homePage.html:235
+msgid "Control DNS"
+msgstr ""
+
+#: baseTemplate/templates/baseTemplate/homePage.html:238
#: 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:252
+#: baseTemplate/templates/baseTemplate/homePage.html:248
+#: ftp/templates/ftp/index.html:12
+msgid "FTP Functions"
+msgstr "FTP funkcije"
+
+#: baseTemplate/templates/baseTemplate/homePage.html:251
#: baseTemplate/templates/baseTemplate/index.html:378
+#: baseTemplate/templates/baseTemplate/index.html:536
#: baseTemplate/templates/baseTemplate/index.html:538
#: websiteFunctions/templates/websiteFunctions/website.html:39
msgid "FTP"
msgstr "FTP"
-#: baseTemplate/templates/baseTemplate/homePage.html:282
-#: packages/templates/packages/createPackage.html:67
-#: packages/templates/packages/modifyPackage.html:70
+#: baseTemplate/templates/baseTemplate/homePage.html:278
+#: baseTemplate/templates/baseTemplate/homePage.html:281
+#: packages/templates/packages/createPackage.html:75
+#: packages/templates/packages/modifyPackage.html:80
msgid "Emails"
msgstr "Emailovi"
-#: baseTemplate/templates/baseTemplate/homePage.html:295
+#: baseTemplate/templates/baseTemplate/homePage.html:291
+#: baseTemplate/templates/baseTemplate/homePage.html:294
#: tuning/templates/tuning/index.html:12
msgid "Server Tuning"
msgstr "Server tuning"
-#: baseTemplate/templates/baseTemplate/homePage.html:319
+#: 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
#: serverStatus/templates/serverStatus/index.html:13
msgid "Server Status"
msgstr "Status servera"
-#: baseTemplate/templates/baseTemplate/homePage.html:332
-#: baseTemplate/templates/baseTemplate/index.html:627
-#: managePHP/templates/managePHP/installExtensions.html:62
-msgid "PHP"
-msgstr "PHP"
+#: baseTemplate/templates/baseTemplate/homePage.html:328
+#, fuzzy
+#| msgid "Edit PHP Configurations"
+msgid "PHP Configurations"
+msgstr "Izmijeni PHP konfiguracije"
-#: baseTemplate/templates/baseTemplate/homePage.html:344
+#: baseTemplate/templates/baseTemplate/homePage.html:340
+#: baseTemplate/templates/baseTemplate/homePage.html:343
#: baseTemplate/templates/baseTemplate/index.html:643
#: websiteFunctions/templates/websiteFunctions/website.html:113
msgid "Logs"
msgstr "Logovi"
-#: baseTemplate/templates/baseTemplate/homePage.html:367
+#: baseTemplate/templates/baseTemplate/homePage.html:363
+#: baseTemplate/templates/baseTemplate/homePage.html:366
+#: baseTemplate/templates/baseTemplate/index.html:659
#: baseTemplate/templates/baseTemplate/index.html:661
msgid "Security"
msgstr "Sigurnost"
@@ -456,26 +648,69 @@ msgstr "Status CPU-a"
msgid "Disk Usage"
msgstr "Upotreba diska "
+#: baseTemplate/templates/baseTemplate/index.html:275
+#: baseTemplate/templates/baseTemplate/index.html:278
+#: baseTemplate/templates/baseTemplate/index.html:282
+#, fuzzy
+#| msgid "Home - CyberPanel"
+msgid "CyberPanel"
+msgstr "Početna - CyberPanel"
+
#: baseTemplate/templates/baseTemplate/index.html:280
#: baseTemplate/templates/baseTemplate/index.html:284
msgid "Web Hosting Control Panel"
msgstr "Web hosting Kontrolni panel"
+#: baseTemplate/templates/baseTemplate/index.html:286
+msgid "Close sidebar"
+msgstr ""
+
+#: baseTemplate/templates/baseTemplate/index.html:292
+#, fuzzy
+#| msgid "FTP Accounts"
+msgid "My Account"
+msgstr "FTP računa"
+
#: baseTemplate/templates/baseTemplate/index.html:309
msgid "Edit profile"
msgstr "Uredi profil"
#: baseTemplate/templates/baseTemplate/index.html:310
#: baseTemplate/templates/baseTemplate/index.html:433
+#: userManagment/templates/userManagment/index.html:26
#: userManagment/templates/userManagment/index.html:28
msgid "View Profile"
msgstr "Pogledaj Profil"
#: baseTemplate/templates/baseTemplate/index.html:317
+#: baseTemplate/templates/baseTemplate/index.html:398
msgid "Logout"
msgstr "Odjavi se"
+#: baseTemplate/templates/baseTemplate/index.html:328
+#: baseTemplate/templates/baseTemplate/index.html:332
+#: baseTemplate/templates/baseTemplate/index.html:336
+msgid "CPU Load Average"
+msgstr ""
+
+#: baseTemplate/templates/baseTemplate/index.html:340
+msgid "Fullscreen"
+msgstr ""
+
+#: baseTemplate/templates/baseTemplate/index.html:345
+#, fuzzy
+#| msgid "Server Status"
+msgid "System Status"
+msgstr "Status servera"
+
+#: baseTemplate/templates/baseTemplate/index.html:350
+#, fuzzy
+#| msgid "Dashboard"
+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
msgid "Tuning"
msgstr "Tuning"
@@ -484,10 +719,13 @@ msgstr "Tuning"
msgid "Overview"
msgstr "Pregled"
+#: baseTemplate/templates/baseTemplate/index.html:413
#: baseTemplate/templates/baseTemplate/index.html:415
+#: baseTemplate/templates/baseTemplate/index.html:417
msgid "Dashboard"
msgstr "Kontrolna ploča"
+#: baseTemplate/templates/baseTemplate/index.html:418
#: baseTemplate/templates/baseTemplate/index.html:419
#: baseTemplate/templates/baseTemplate/versionManagment.html:10
msgid "Version Management"
@@ -503,6 +741,7 @@ msgid "Create New User"
msgstr "Novi korisnik"
#: baseTemplate/templates/baseTemplate/index.html:435
+#: userManagment/templates/userManagment/index.html:52
#: userManagment/templates/userManagment/index.html:54
#: userManagment/templates/userManagment/modifyUser.html:12
#: userManagment/templates/userManagment/modifyUser.html:120
@@ -513,6 +752,7 @@ msgstr "Promjena korisnika"
#: userManagment/templates/userManagment/deleteUser.html:13
#: userManagment/templates/userManagment/deleteUser.html:20
#: userManagment/templates/userManagment/deleteUser.html:42
+#: userManagment/templates/userManagment/index.html:74
#: userManagment/templates/userManagment/index.html:76
msgid "Delete User"
msgstr "Brisanje korisnika"
@@ -520,17 +760,20 @@ msgstr "Brisanje korisnika"
#: baseTemplate/templates/baseTemplate/index.html:451
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:12
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:102
+#: websiteFunctions/templates/websiteFunctions/index.html:26
#: websiteFunctions/templates/websiteFunctions/index.html:28
msgid "Create Website"
msgstr "Kreiranje sajta"
#: baseTemplate/templates/baseTemplate/index.html:452
+#: websiteFunctions/templates/websiteFunctions/index.html:38
#: websiteFunctions/templates/websiteFunctions/index.html:40
#: websiteFunctions/templates/websiteFunctions/listWebsites.html:14
msgid "List Websites"
msgstr "Lista sajtova"
#: baseTemplate/templates/baseTemplate/index.html:453
+#: websiteFunctions/templates/websiteFunctions/index.html:50
#: websiteFunctions/templates/websiteFunctions/index.html:52
#: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:12
#: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:19
@@ -547,13 +790,15 @@ msgstr "Suspend/Unsuspend"
#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:12
#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:19
#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:42
+#: websiteFunctions/templates/websiteFunctions/index.html:84
#: websiteFunctions/templates/websiteFunctions/index.html:86
msgid "Delete Website"
msgstr "Izbriši sajt"
#: baseTemplate/templates/baseTemplate/index.html:468
#: packages/templates/packages/createPackage.html:13
-#: packages/templates/packages/createPackage.html:76
+#: packages/templates/packages/createPackage.html:84
+#: packages/templates/packages/index.html:25
#: packages/templates/packages/index.html:27
msgid "Create Package"
msgstr "Kreiraj paket"
@@ -562,15 +807,17 @@ msgstr "Kreiraj paket"
#: packages/templates/packages/deletePackage.html:12
#: packages/templates/packages/deletePackage.html:18
#: packages/templates/packages/deletePackage.html:40
+#: packages/templates/packages/index.html:37
#: packages/templates/packages/index.html:39
msgid "Delete Package"
msgstr "Izbriši paket"
#: baseTemplate/templates/baseTemplate/index.html:470
+#: packages/templates/packages/index.html:49
#: packages/templates/packages/index.html:51
#: packages/templates/packages/modifyPackage.html:9
#: packages/templates/packages/modifyPackage.html:15
-#: packages/templates/packages/modifyPackage.html:85
+#: packages/templates/packages/modifyPackage.html:95
msgid "Modify Package"
msgstr "Promijeni paket"
@@ -578,7 +825,9 @@ msgstr "Promijeni paket"
#: databases/templates/databases/createDatabase.html:12
#: databases/templates/databases/createDatabase.html:19
#: databases/templates/databases/createDatabase.html:68
+#: databases/templates/databases/index.html:25
#: databases/templates/databases/index.html:27
+#: manageSSL/templates/manageSSL/index.html:26
msgid "Create Database"
msgstr "Kreiranje baze"
@@ -586,11 +835,14 @@ msgstr "Kreiranje baze"
#: databases/templates/databases/deleteDatabase.html:12
#: databases/templates/databases/deleteDatabase.html:19
#: databases/templates/databases/deleteDatabase.html:53
+#: databases/templates/databases/index.html:37
#: databases/templates/databases/index.html:39
+#: manageSSL/templates/manageSSL/index.html:38
msgid "Delete Database"
msgstr "Brisanje baze"
#: baseTemplate/templates/baseTemplate/index.html:486
+#: databases/templates/databases/index.html:53
#: databases/templates/databases/index.html:55
#: databases/templates/databases/listDataBases.html:13
#: databases/templates/databases/listDataBases.html:19
@@ -598,25 +850,29 @@ msgid "List Databases"
msgstr "Lista baza"
#: baseTemplate/templates/baseTemplate/index.html:487
+#: databases/templates/databases/index.html:65
#: databases/templates/databases/index.html:67
msgid "PHPMYAdmin"
msgstr "PHPMYAdmin"
#: baseTemplate/templates/baseTemplate/index.html:502
#: dns/templates/dns/createNameServer.html:12
-#: dns/templates/dns/createNameServer.html:76 dns/templates/dns/index.html:74
+#: dns/templates/dns/createNameServer.html:76 dns/templates/dns/index.html:72
+#: dns/templates/dns/index.html:74
msgid "Create Nameserver"
msgstr "Kreiranje name servera"
#: baseTemplate/templates/baseTemplate/index.html:503
#: dns/templates/dns/createDNSZone.html:12
-#: dns/templates/dns/createDNSZone.html:40 dns/templates/dns/index.html:31
+#: dns/templates/dns/createDNSZone.html:40 dns/templates/dns/index.html:29
+#: dns/templates/dns/index.html:31 dns/templates/dns/index.html:84
#: dns/templates/dns/index.html:86
msgid "Create DNS Zone"
msgstr "Kreiranje DNS zone"
#: baseTemplate/templates/baseTemplate/index.html:504
-#: dns/templates/dns/deleteDNSZone.html:40 dns/templates/dns/index.html:43
+#: dns/templates/dns/deleteDNSZone.html:40 dns/templates/dns/index.html:41
+#: dns/templates/dns/index.html:43 dns/templates/dns/index.html:96
#: dns/templates/dns/index.html:98
msgid "Delete Zone"
msgstr "Briši zonu"
@@ -625,31 +881,37 @@ msgstr "Briši zonu"
msgid "Add/Delete Records"
msgstr "Dodaj / izbriši unose"
-#: baseTemplate/templates/baseTemplate/index.html:516
-#: userManagment/templates/userManagment/createUser.html:47
-#: userManagment/templates/userManagment/modifyUser.html:54
-#: userManagment/templates/userManagment/userProfile.html:50
-#: websiteFunctions/templates/websiteFunctions/createWebsite.html:60
-#: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:67
-msgid "Email"
-msgstr "Email"
+#: baseTemplate/templates/baseTemplate/index.html:521
+#: mailServer/templates/mailServer/createEmailAccount.html:12
+#: mailServer/templates/mailServer/createEmailAccount.html:19
+msgid "Create Email Account"
+msgstr "Kreiraj email račun"
#: baseTemplate/templates/baseTemplate/index.html:521
#: mailServer/templates/mailServer/createEmailAccount.html:64
+#: mailServer/templates/mailServer/index.html:25
#: mailServer/templates/mailServer/index.html:27
msgid "Create Email"
msgstr "Kreiraj email"
+#: baseTemplate/templates/baseTemplate/index.html:522
+#: mailServer/templates/mailServer/deleteEmailAccount.html:12
+#: mailServer/templates/mailServer/deleteEmailAccount.html:19
+msgid "Delete Email Account"
+msgstr "Izbriši email račun"
+
#: baseTemplate/templates/baseTemplate/index.html:522
#: mailServer/templates/mailServer/deleteEmailAccount.html:56
+#: mailServer/templates/mailServer/index.html:37
#: mailServer/templates/mailServer/index.html:39
msgid "Delete Email"
msgstr "Izbriši email"
#: baseTemplate/templates/baseTemplate/index.html:523
-#: databases/templates/databases/listDataBases.html:72
+#: databases/templates/databases/listDataBases.html:73
#: ftp/templates/ftp/listFTPAccounts.html:73
#: mailServer/templates/mailServer/changeEmailPassword.html:64
+#: mailServer/templates/mailServer/index.html:49
#: mailServer/templates/mailServer/index.html:51
msgid "Change Password"
msgstr "Promijeni šifru"
@@ -660,33 +922,35 @@ msgstr "Pristup webmailu"
#: baseTemplate/templates/baseTemplate/index.html:543
#: ftp/templates/ftp/createFTPAccount.html:12
-#: ftp/templates/ftp/createFTPAccount.html:19 ftp/templates/ftp/index.html:27
-#: websiteFunctions/templates/websiteFunctions/website.html:461
+#: 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
msgid "Create FTP Account"
msgstr "Kreiranje FTP računa"
#: baseTemplate/templates/baseTemplate/index.html:544
#: ftp/templates/ftp/deleteFTPAccount.html:12
#: ftp/templates/ftp/deleteFTPAccount.html:18
-#: ftp/templates/ftp/deleteFTPAccount.html:52 ftp/templates/ftp/index.html:39
-#: websiteFunctions/templates/websiteFunctions/website.html:473
+#: 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
msgid "Delete FTP Account"
msgstr "Briši FTP račun"
#: baseTemplate/templates/baseTemplate/index.html:545
-#: ftp/templates/ftp/index.html:51 ftp/templates/ftp/listFTPAccounts.html:13
+#: ftp/templates/ftp/index.html:49 ftp/templates/ftp/index.html:51
+#: ftp/templates/ftp/listFTPAccounts.html:13
#: ftp/templates/ftp/listFTPAccounts.html:19
msgid "List FTP Accounts"
msgstr "Lista FTP računa"
-#: baseTemplate/templates/baseTemplate/index.html:562
-msgid "Restore Back up"
-msgstr "Vrati backup"
-
#: baseTemplate/templates/baseTemplate/index.html:563
msgid "Add/Delete Destination"
msgstr "Dodaj / izbriši destinaciju"
+#: baseTemplate/templates/baseTemplate/index.html:573
#: baseTemplate/templates/baseTemplate/index.html:574
msgid "SSL"
msgstr "SSL"
@@ -712,34 +976,43 @@ msgid "NEW"
msgstr "Novi"
#: baseTemplate/templates/baseTemplate/index.html:598
-#: tuning/templates/tuning/index.html:26
+#: 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
-#: tuning/templates/tuning/index.html:38
+#: 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
+#: serverStatus/templates/serverStatus/index.html:25
#: serverStatus/templates/serverStatus/index.html:27
msgid "LiteSpeed Status"
msgstr "LiteSpeed status"
#: baseTemplate/templates/baseTemplate/index.html:615
#: 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
+#: managePHP/templates/managePHP/installExtensions.html:13
+msgid "Install PHP Extensions"
+msgstr "Instalacija extenzija za php"
+
+#: baseTemplate/templates/baseTemplate/index.html:632
+#: managePHP/templates/managePHP/index.html:24
#: managePHP/templates/managePHP/index.html:26
msgid "Install Extensions"
msgstr "Instalacija extenzija"
#: baseTemplate/templates/baseTemplate/index.html:633
+#: managePHP/templates/managePHP/index.html:36
#: managePHP/templates/managePHP/index.html:38
msgid "Edit PHP Configs"
msgstr "Promjena php konfiguracije"
@@ -750,27 +1023,44 @@ msgstr "Pristupni log"
#: baseTemplate/templates/baseTemplate/index.html:649
#: serverLogs/templates/serverLogs/errorLogs.html:14
+#: serverLogs/templates/serverLogs/index.html:37
#: serverLogs/templates/serverLogs/index.html:39
#: websiteFunctions/templates/websiteFunctions/website.html:133
msgid "Error Logs"
msgstr "Log grešaka"
+#: baseTemplate/templates/baseTemplate/index.html:650
+#: 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
msgid "Email Log"
msgstr "Email log"
#: baseTemplate/templates/baseTemplate/index.html:651
#: 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
+#, fuzzy
+#| msgid "Firewall"
+msgid "Firewall Home"
+msgstr "Firewall "
+
+#: baseTemplate/templates/baseTemplate/index.html:666
+#: firewall/templates/firewall/index.html:25
#: firewall/templates/firewall/index.html:27
msgid "Firewall"
msgstr "Firewall "
#: baseTemplate/templates/baseTemplate/index.html:667
+#: firewall/templates/firewall/index.html:36
#: firewall/templates/firewall/index.html:38
#: firewall/templates/firewall/secureSSH.html:13
#: firewall/templates/firewall/secureSSH.html:20
@@ -786,8 +1076,6 @@ msgid ""
"On this page you can manage versions and or upgrade to latest version of "
"CyberPanel"
msgstr ""
-"Na ovoj strani možete manipulisati verzijama ili izvršiti nadogradnju na "
-"zadnju verziju panela"
#: baseTemplate/templates/baseTemplate/versionManagment.html:25
msgid "Current Version"
@@ -837,7 +1125,7 @@ msgid "Create a new database on this page."
msgstr "Kreiraj novu bazu podataka na ovoj stranici"
#: databases/templates/databases/createDatabase.html:42
-#: databases/templates/databases/listDataBases.html:87
+#: databases/templates/databases/listDataBases.html:88
msgid "Database Name"
msgstr "Naziv baze"
@@ -877,10 +1165,6 @@ msgstr "Baza podataka uspješno izbrisana."
msgid "Database Functions - CyberPanel"
msgstr "Funkcije baze podataka - CyberPanel"
-#: databases/templates/databases/index.html:12
-msgid "Database Functions"
-msgstr "Funkcije za bazu podataka"
-
#: databases/templates/databases/index.html:13
msgid "Create, edit and delete databases on this page."
msgstr "Kreirajte, uređujte i izbrišite baze podataka na ovoj stranici."
@@ -906,21 +1190,27 @@ msgstr "Odaberite domene"
msgid "Records successfully fetched for"
msgstr "Zapisnici su uspješno dohvaćeni za"
-#: databases/templates/databases/listDataBases.html:53
+#: databases/templates/databases/listDataBases.html:50
+#, fuzzy
+#| msgid "Password changed for"
+msgid "Password changed for: "
+msgstr "Šifra je promenjena za "
+
+#: databases/templates/databases/listDataBases.html:54
msgid "Cannot change password for "
msgstr "Ne može se promijeniti šifra za "
-#: databases/templates/databases/listDataBases.html:58
+#: databases/templates/databases/listDataBases.html:59
#: firewall/templates/firewall/firewall.html:166
#: 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 "
-#: databases/templates/databases/listDataBases.html:88
+#: databases/templates/databases/listDataBases.html:89
msgid "Database User"
msgstr "Korisničko ime baze podataka"
-#: databases/templates/databases/listDataBases.html:97
+#: databases/templates/databases/listDataBases.html:98
#: ftp/templates/ftp/listFTPAccounts.html:100
msgid "Change"
msgstr "Promjena"
@@ -945,6 +1235,38 @@ msgstr ""
msgid "Add Records"
msgstr "Dodajte zapise"
+#: dns/templates/dns/addDeleteDNSRecords.html:53
+#: dns/templates/dns/addDeleteDNSRecords.html:131
+#: firewall/templates/firewall/firewall.html:128
+#: serverStatus/templates/serverStatus/litespeedStatus.html:40
+msgid "Name"
+msgstr "Ime"
+
+#: dns/templates/dns/addDeleteDNSRecords.html:69
+msgid "IPV6"
+msgstr ""
+
+#: dns/templates/dns/addDeleteDNSRecords.html:78
+#: dns/templates/dns/addDeleteDNSRecords.html:133
+msgid "Priority"
+msgstr "Prioritet"
+
+#: dns/templates/dns/addDeleteDNSRecords.html:87
+#: dns/templates/dns/createDNSZone.html:27
+#: dns/templates/dns/createNameServer.html:27
+#: websiteFunctions/templates/websiteFunctions/createWebsite.html:52
+#: websiteFunctions/templates/websiteFunctions/website.html:263
+msgid "Domain Name"
+msgstr "Naziv domene"
+
+#: dns/templates/dns/addDeleteDNSRecords.html:95
+msgid "Policy"
+msgstr ""
+
+#: dns/templates/dns/addDeleteDNSRecords.html:103
+msgid "Text"
+msgstr ""
+
#: dns/templates/dns/addDeleteDNSRecords.html:111
#: firewall/templates/firewall/firewall.html:109
msgid "Add"
@@ -954,20 +1276,10 @@ msgstr "Dodati"
msgid "Type"
msgstr "Tip"
-#: dns/templates/dns/addDeleteDNSRecords.html:131
-#: firewall/templates/firewall/firewall.html:128
-#: serverStatus/templates/serverStatus/litespeedStatus.html:40
-msgid "Name"
-msgstr "Ime"
-
#: dns/templates/dns/addDeleteDNSRecords.html:132
msgid "Value"
msgstr "Vrijednost"
-#: dns/templates/dns/addDeleteDNSRecords.html:133
-msgid "Priority"
-msgstr "Prioritet"
-
#: dns/templates/dns/addDeleteDNSRecords.html:160
msgid "Cannot fetch records. Error message:"
msgstr "Ne mogu preuzeti podatke. Poruka o grešci:"
@@ -1006,12 +1318,6 @@ msgstr ""
msgid "Details"
msgstr "Detalji"
-#: dns/templates/dns/createDNSZone.html:27
-#: dns/templates/dns/createNameServer.html:27
-#: websiteFunctions/templates/websiteFunctions/createWebsite.html:52
-msgid "Domain Name"
-msgstr "Naziv domene"
-
#: dns/templates/dns/createDNSZone.html:51
msgid "Cannot create DNS Zone. Error message:"
msgstr "Ne mogu napraviti DNS zonu. Poruka o grešci:"
@@ -1102,6 +1408,12 @@ msgstr "Funkcije dns-a"
msgid "Create, edit and delete DNS zones on this page."
msgstr "Kreiranje, uređivanje i brisanje DNS zona na ovoj stranici."
+#: dns/templates/dns/index.html:53 dns/templates/dns/index.html:108
+#, fuzzy
+#| msgid "Add/Delete Records"
+msgid "Add Delete Records"
+msgstr "Dodaj / izbriši unose"
+
#: dns/templates/dns/index.html:55 dns/templates/dns/index.html:110
msgid "Add Delete/Records"
msgstr "Dodaj / izbriši unose"
@@ -1176,9 +1488,10 @@ msgid "Secure SSH - CyberPanel"
msgstr "Siguran SSH"
#: firewall/templates/firewall/secureSSH.html:14
-#: managePHP/templates/managePHP/editPHPConfig.html:15
-msgid "Edit PHP Configurations on this page."
-msgstr "Izmijenite PHP konfiguracije na ovoj stranici."
+#, fuzzy
+#| msgid "SSH Configurations Saved."
+msgid "Secure or harden SSH Configurations."
+msgstr "SSH konfiguracije su sačuvane."
#: firewall/templates/firewall/secureSSH.html:28
#: managePHP/templates/managePHP/editPHPConfig.html:29
@@ -1225,8 +1538,8 @@ msgstr "Dodaj ključ"
#: firewall/templates/firewall/secureSSH.html:158
#: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:55
-#: websiteFunctions/templates/websiteFunctions/website.html:303
-#: websiteFunctions/templates/websiteFunctions/website.html:363
+#: websiteFunctions/templates/websiteFunctions/website.html:527
+#: websiteFunctions/templates/websiteFunctions/website.html:587
msgid "Save"
msgstr "Sačuvaj"
@@ -1254,6 +1567,10 @@ msgstr "FTP šifra"
msgid "Path (Relative)"
msgstr "Putanja (Relativno)"
+#: ftp/templates/ftp/createFTPAccount.html:61
+msgid "Leave empty to select default home directory."
+msgstr ""
+
#: ftp/templates/ftp/createFTPAccount.html:72
msgid "Create FTP"
msgstr "Kreiraj FTP"
@@ -1304,10 +1621,6 @@ msgstr ""
msgid "FTP Functions - CyberPanel"
msgstr "FTP funkcije"
-#: ftp/templates/ftp/index.html:12
-msgid "FTP Functions"
-msgstr "FTP funkcije"
-
#: ftp/templates/ftp/index.html:13
msgid "Delete and create FTP accounts on this page."
msgstr "Obrišite i kreirajte FTP naloge na ovoj stranici."
@@ -1371,11 +1684,6 @@ msgstr "Trenutno za ovaj domen ne postoje email računi."
msgid "Create Email Account - CyberPanel"
msgstr "Kreiranje email računa"
-#: mailServer/templates/mailServer/createEmailAccount.html:12
-#: mailServer/templates/mailServer/createEmailAccount.html:19
-msgid "Create Email Account"
-msgstr "Kreiraj email račun"
-
#: mailServer/templates/mailServer/createEmailAccount.html:13
msgid "Select a website from the list, to create an email account."
msgstr "Izaberite web stranicu sa liste da biste kreirali nalog e-pošte."
@@ -1396,11 +1704,6 @@ msgstr " uspješno je kreiran."
msgid "Delete Email Account - CyberPanel"
msgstr "Izbriši e-poštu - CyberPanel"
-#: mailServer/templates/mailServer/deleteEmailAccount.html:12
-#: mailServer/templates/mailServer/deleteEmailAccount.html:19
-msgid "Delete Email Account"
-msgstr "Izbriši email račun"
-
#: mailServer/templates/mailServer/deleteEmailAccount.html:13
msgid "Select a website from the list, to delete an email account."
msgstr "Izaberite web stranicu sa liste da biste izbrisali nalog e-pošte."
@@ -1430,6 +1733,10 @@ msgstr "Izmijena PHP konfiguracije - CyberPanel"
msgid "Edit PHP Configurations"
msgstr "Izmijeni PHP konfiguracije"
+#: managePHP/templates/managePHP/editPHPConfig.html:15
+msgid "Edit PHP Configurations on this page."
+msgstr "Izmijenite PHP konfiguracije na ovoj stranici."
+
#: managePHP/templates/managePHP/editPHPConfig.html:35
msgid "Advanced"
msgstr "Napredno"
@@ -1440,6 +1747,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
msgid "Select PHP"
msgstr "Izaberi PHP"
@@ -1497,19 +1805,21 @@ msgstr ""
msgid "Install PHP Extensions - CyberPanel"
msgstr "Instalacija extenzija za php"
-#: managePHP/templates/managePHP/installExtensions.html:13
-msgid "Install PHP Extensions"
-msgstr "Instalacija extenzija za php"
-
#: managePHP/templates/managePHP/installExtensions.html:14
msgid "Install/uninstall php extensions on this page."
-msgstr "Instalacija/deintalacija php extenzija na ovo strani."
+msgstr ""
#: managePHP/templates/managePHP/installExtensions.html:19
#: tuning/templates/tuning/phpTuning.html:19
msgid "Select PHP Version"
msgstr "PHP verzija"
+#: managePHP/templates/managePHP/installExtensions.html:48
+#, fuzzy
+#| msgid "Install Extensions"
+msgid "Search Extensions.."
+msgstr "Instalacija extenzija"
+
#: managePHP/templates/managePHP/installExtensions.html:63
msgid "Extension Name"
msgstr "Ime proširenja (extenzije)"
@@ -1624,38 +1934,47 @@ msgid "Package Name"
msgstr "Naziv paketa"
#: packages/templates/packages/createPackage.html:35
-#: packages/templates/packages/modifyPackage.html:39
+#: packages/templates/packages/modifyPackage.html:40
+#: websiteFunctions/templates/websiteFunctions/website.html:223
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Domains"
+msgstr "Naziv domene"
+
+#: packages/templates/packages/createPackage.html:39
+#: packages/templates/packages/modifyPackage.html:44
+#, fuzzy
+#| msgid "( 0 = Unlimited )"
+msgid "(0 = Unlimited)"
+msgstr "(0=Neograničeno)"
+
+#: packages/templates/packages/createPackage.html:43
+#: packages/templates/packages/modifyPackage.html:49
msgid "Disk Space"
msgstr "Prostor na disku"
-#: packages/templates/packages/createPackage.html:39
#: packages/templates/packages/createPackage.html:47
-#: packages/templates/packages/modifyPackage.html:43
-#: packages/templates/packages/modifyPackage.html:51
+#: packages/templates/packages/createPackage.html:55
+#: packages/templates/packages/modifyPackage.html:53
+#: packages/templates/packages/modifyPackage.html:61
msgid "MB (0 = Unlimited)"
msgstr "MB (0=neograničeno)"
-#: packages/templates/packages/createPackage.html:43
-#: packages/templates/packages/modifyPackage.html:47
+#: packages/templates/packages/createPackage.html:51
+#: packages/templates/packages/modifyPackage.html:57
msgid "Bandwidth"
msgstr "Mjesečni protok"
-#: packages/templates/packages/createPackage.html:52
-#: packages/templates/packages/modifyPackage.html:56
+#: packages/templates/packages/createPackage.html:60
+#: packages/templates/packages/modifyPackage.html:66
msgid "FTP Accounts"
msgstr "FTP računa"
-#: packages/templates/packages/createPackage.html:87
+#: packages/templates/packages/createPackage.html:95
msgid "Cannot create package. Error message:"
msgstr "Ne mogu napraviti paket. Poruka o grešci:"
-#: packages/templates/packages/createPackage.html:91
-#: packages/templates/packages/deletePackage.html:63
-#: packages/templates/packages/modifyPackage.html:102
-msgid "Package"
-msgstr "Paket"
-
-#: packages/templates/packages/createPackage.html:91
+#: packages/templates/packages/createPackage.html:99
msgid "Successfully Created"
msgstr "Uspješno kreiran"
@@ -1687,15 +2006,15 @@ msgstr "Paketi"
msgid "Modify Package - CyberPanel"
msgstr "Izmijeni paket - CyberPanel"
-#: packages/templates/packages/modifyPackage.html:94
+#: packages/templates/packages/modifyPackage.html:104
msgid "Cannot fetch package details. Error message:"
msgstr "Ne mogu preuzeti podatke o paketu. Poruka o grešci:"
-#: packages/templates/packages/modifyPackage.html:98
+#: packages/templates/packages/modifyPackage.html:108
msgid "Package Details Successfully Fetched"
msgstr "Detalji paketa su uspješno izvedeni"
-#: packages/templates/packages/modifyPackage.html:102
+#: packages/templates/packages/modifyPackage.html:112
msgid "Successfully Modified"
msgstr "Uspješno je izmijenjen"
@@ -1704,6 +2023,7 @@ msgid "Access Logs - CyberPanel"
msgstr "Pristupni logovi - CyberPanel"
#: serverLogs/templates/serverLogs/accessLogs.html:17
+#: serverLogs/templates/serverLogs/index.html:25
#: serverLogs/templates/serverLogs/index.html:27
#: websiteFunctions/templates/websiteFunctions/website.html:121
msgid "Access Logs"
@@ -1752,11 +2072,6 @@ msgstr ""
msgid "Error Logs - CyberPanel"
msgstr "Logovi grešaka - CyberPanel"
-#: serverLogs/templates/serverLogs/emailLogs.html:14
-#: serverLogs/templates/serverLogs/index.html:51
-msgid "Email Logs"
-msgstr "Email logovi"
-
#: serverLogs/templates/serverLogs/emailLogs.html:15
msgid "Email Logs for main web server."
msgstr "Evidencija email logova za glavni web server."
@@ -1787,7 +2102,7 @@ msgid ""
"to: Websites -> List Websites -> Select Website -> View Logs."
msgstr ""
"Ovo su logovi glavnog servera, da biste ih vidjeli idite na: Sajtove -> "
-"Lista sajtova -> Odabir sajta -> Pregled logova."
+"Lista sajtova -> Odabir sajta -> Pregled logova"
#: serverStatus/templates/serverStatus/cybercpmainlogfile.html:3
msgid "CyberPanel Main Log File - CyberPanel"
@@ -1798,8 +2113,6 @@ msgid ""
"This log file corresponds to errors generated by CyberPanel for your domain "
"errors log you can look into /home/domain/logs."
msgstr ""
-"Ovaj log fajl odgovara greškama generisanim od strane sistema za vašu domenu "
-"i mogu se pogledati na /home/domain/logs."
#: serverStatus/templates/serverStatus/index.html:3
msgid "Server Status - CyberPanel"
@@ -1847,11 +2160,11 @@ msgid ""
"Could not fetch details, either LiteSpeed is not running or some error "
"occurred, please see CyberPanel Main log file."
msgstr ""
-"Nije bilo moguće dohvatiti detalje, ili LiteSpeed nije pokrenut ili se "
-"pojavila neka greška. Molimo da pogledate glavni log fajl sa greškama."
#: serverStatus/templates/serverStatus/litespeedStatus.html:72
-msgid "Reboot LiteSpeed"
+#, fuzzy
+#| msgid "Reboot LiteSpeed"
+msgid "Reboot Litespeed"
msgstr "Ponovo pokreni LiteSpeed"
#: serverStatus/templates/serverStatus/litespeedStatus.html:77
@@ -1860,7 +2173,7 @@ msgstr "Zaustavi LiteSpeed"
#: serverStatus/templates/serverStatus/litespeedStatus.html:90
msgid "Error Occurred. See CyberPanel main log file."
-msgstr "Dogodila se greška. Pogledajte glavni log fajl."
+msgstr ""
#: serverStatus/templates/serverStatus/litespeedStatus.html:95
msgid "Could not connect to server."
@@ -1868,7 +2181,7 @@ msgstr "Ne mogu se spojiti na udaljeni računar."
#: tuning/templates/tuning/index.html:3
msgid "Server Tuning - CyberPanel"
-msgstr "Server tuning"
+msgstr ""
#: tuning/templates/tuning/index.html:13
msgid ""
@@ -1878,7 +2191,7 @@ msgstr ""
#: tuning/templates/tuning/liteSpeedTuning.html:3
msgid "LiteSpeed Tuning - CyberPanel"
-msgstr "LiteSpeed tuning"
+msgstr ""
#: tuning/templates/tuning/liteSpeedTuning.html:13
msgid ""
@@ -1888,16 +2201,16 @@ msgstr ""
#: tuning/templates/tuning/liteSpeedTuning.html:18
msgid "Tuning Details"
-msgstr "Tuning detalji"
+msgstr ""
#: tuning/templates/tuning/liteSpeedTuning.html:28
#: tuning/templates/tuning/phpTuning.html:52
msgid "Max Connections"
-msgstr "Mrežne konekcije"
+msgstr ""
#: tuning/templates/tuning/liteSpeedTuning.html:36
msgid "Max SSL Connections"
-msgstr "Max ssl konekcija"
+msgstr ""
#: tuning/templates/tuning/liteSpeedTuning.html:44
msgid "Connection Timeout"
@@ -1909,7 +2222,7 @@ msgstr ""
#: tuning/templates/tuning/liteSpeedTuning.html:60
msgid "Cache Size in memory"
-msgstr "Veličina Chachea u memoriji"
+msgstr ""
#: tuning/templates/tuning/liteSpeedTuning.html:67
msgid "Enable GZIP Compression"
@@ -1943,7 +2256,7 @@ msgstr ""
#: tuning/templates/tuning/liteSpeedTuning.html:97
msgid "Cannot save details, Error Message: "
-msgstr "Ne mogu da prikupim detalje. Poruka o grešci: "
+msgstr "Ne mogu da prikupim detalje. Poruka o grešci:"
#: tuning/templates/tuning/liteSpeedTuning.html:102
msgid "Web Server Successfully tuned."
@@ -1979,7 +2292,7 @@ msgstr ""
#: tuning/templates/tuning/phpTuning.html:90
msgid "Persistent Connection"
-msgstr "Mrežne konekcije"
+msgstr ""
#: tuning/templates/tuning/phpTuning.html:105
msgid "Tune PHP"
@@ -1987,11 +2300,11 @@ msgstr "PHP"
#: tuning/templates/tuning/phpTuning.html:118
msgid "Cannot tune. Error message:"
-msgstr "Ne mogu izvršiti operaciju. Poruka o grešci:"
+msgstr ""
#: tuning/templates/tuning/phpTuning.html:123
msgid "Details Successfully fetched."
-msgstr "Detalji su uspješno izvedeni."
+msgstr ""
#: tuning/templates/tuning/phpTuning.html:127
msgid "PHP version "
@@ -1999,15 +2312,15 @@ msgstr "PHP verzija "
#: tuning/templates/tuning/phpTuning.html:127
msgid "Successfully tuned."
-msgstr "Uspješno izmijenjeno."
+msgstr ""
#: userManagment/templates/userManagment/createUser.html:3
msgid "Create New User - CyberPanel"
-msgstr "Novi korisnik"
+msgstr ""
#: userManagment/templates/userManagment/createUser.html:13
msgid "Create root, reseller or normal users on this page."
-msgstr "Kreirajte, uređujte i izbrišite korisnike na ovoj stranici."
+msgstr ""
#: userManagment/templates/userManagment/createUser.html:19
msgid "User Details"
@@ -2071,7 +2384,7 @@ msgstr "Samo brojevi"
#: userManagment/templates/userManagment/modifyUser.html:99
#: userManagment/templates/userManagment/userProfile.html:82
msgid "Websites Limit"
-msgstr "Limit sajtova"
+msgstr ""
#: userManagment/templates/userManagment/createUser.html:113
#: userManagment/templates/userManagment/userProfile.html:42
@@ -2087,6 +2400,7 @@ msgid "Must contain one number and one special character."
msgstr ""
#: userManagment/templates/userManagment/createUser.html:143
+#: userManagment/templates/userManagment/index.html:40
#: userManagment/templates/userManagment/index.html:42
msgid "Create User"
msgstr "Novi korisnik"
@@ -2094,23 +2408,21 @@ msgstr "Novi korisnik"
#: userManagment/templates/userManagment/createUser.html:154
#: userManagment/templates/userManagment/modifyUser.html:131
msgid "Account with username:"
-msgstr "Nalog sa korisničkim imenom:"
+msgstr ""
#: userManagment/templates/userManagment/createUser.html:158
msgid "Cannot create user. Error message:"
-msgstr "Ne mogu napraviti korisnika. Poruka o grešci:"
+msgstr ""
#: userManagment/templates/userManagment/createUser.html:166
msgid ""
"Length of first and last name combined should be less than or equal to 20 "
"characters"
msgstr ""
-"Dužina imena i prezimena kombinovano ne smije da prekorači dužinu od 20 "
-"karaktera"
#: userManagment/templates/userManagment/deleteUser.html:3
msgid "Delete User - CyberPanel"
-msgstr "Brisanje korisnika"
+msgstr ""
#: userManagment/templates/userManagment/deleteUser.html:14
msgid "Websites owned by this user will automatically transfer to the root."
@@ -2132,13 +2444,9 @@ msgstr "Korisnik "
msgid "User Functions - CyberPanel"
msgstr "Korisničke funkcije"
-#: userManagment/templates/userManagment/index.html:13
-msgid "User Functions"
-msgstr "Korisničke funkcije"
-
#: userManagment/templates/userManagment/index.html:14
msgid "Create, edit and delete users on this page."
-msgstr "Kreirajte, uređujte i izbrišite korisnike na ovoj stranici."
+msgstr ""
#: userManagment/templates/userManagment/modifyUser.html:3
msgid "Modify User - CyberPanel"
@@ -2183,7 +2491,7 @@ msgstr ""
#: userManagment/templates/userManagment/userProfile.html:58
msgid "Account Level"
-msgstr "Odaberite level računa"
+msgstr ""
#: userManagment/templates/userManagment/userProfile.html:69
#: userManagment/templates/userManagment/userProfile.html:76
@@ -2193,7 +2501,7 @@ msgstr "(0=Neograničeno)"
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:3
msgid "Create New Website - CyberPanel"
-msgstr "Kreiranje novog sajta"
+msgstr ""
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:13
#: websiteFunctions/templates/websiteFunctions/index.html:14
@@ -2205,7 +2513,7 @@ msgstr ""
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:20
msgid "Website Details"
-msgstr "Detalji sajta"
+msgstr ""
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:40
#: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:56
@@ -2213,34 +2521,41 @@ msgid "Select Owner"
msgstr "Vlasnik"
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:56
+#: websiteFunctions/templates/websiteFunctions/website.html:267
+#: websiteFunctions/templates/websiteFunctions/website.html:278
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
msgid "Additional Features"
msgstr "Dodatne informacije"
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:91
+#: websiteFunctions/templates/websiteFunctions/website.html:306
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
msgid "Cannot create website. Error message:"
-msgstr "Ne mogu napraviti sajt. Poruka o grešci:"
+msgstr ""
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:117
+#: websiteFunctions/templates/websiteFunctions/website.html:332
msgid "Website with domain"
-msgstr "Sajt sa domenom"
+msgstr ""
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:117
+#: websiteFunctions/templates/websiteFunctions/website.html:332
msgid " is Successfully Created"
msgstr " je spješno kreiran"
#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:3
msgid "Delete Website - CyberPanel"
-msgstr "Izbriši sajt"
+msgstr ""
#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:13
msgid ""
@@ -2252,10 +2567,6 @@ msgstr ""
msgid "Cannot delete website, Error message: "
msgstr "Nije moguće izbisati web sajti, greška: "
-#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:65
-msgid "Website"
-msgstr "Sajt"
-
#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:65
msgid "Successfully Deleted."
msgstr "Uspješno izbrisan."
@@ -2264,10 +2575,7 @@ msgstr "Uspješno izbrisan."
msgid "Website Functions - CyberPanel"
msgstr "Funkcije za sajtove"
-#: websiteFunctions/templates/websiteFunctions/index.html:13
-msgid "Website Functions"
-msgstr "Funkcije za sajtove"
-
+#: websiteFunctions/templates/websiteFunctions/index.html:70
#: websiteFunctions/templates/websiteFunctions/index.html:72
#: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:13
#: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:20
@@ -2276,11 +2584,11 @@ msgstr "Suspend/Unsuspend sajt"
#: websiteFunctions/templates/websiteFunctions/listWebsites.html:3
msgid "Websites Hosted - CyberPanel"
-msgstr "Sajtovi"
+msgstr ""
#: websiteFunctions/templates/websiteFunctions/listWebsites.html:51
msgid "Cannot list websites. Error message:"
-msgstr "Nije moguće izlistati sajtove. Greška je:"
+msgstr ""
#: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:3
msgid "Modify Website - CyberPanel"
@@ -2296,23 +2604,23 @@ msgstr "Sadašnji vlasnik:"
#: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:104
msgid "Cannot fetch website details. Error message:"
-msgstr "Ne mogu da prikupim detalje. Poruka o grešci:"
+msgstr ""
#: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:108
msgid "Cannot modify website. Error message:"
-msgstr "Nije moguće izmijeniti sajt. Poruka greške:"
+msgstr ""
#: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:112
msgid "Website Details Successfully fetched"
-msgstr "Detalji sajta su uspješno izvedeni"
+msgstr ""
#: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:3
msgid "Suspend/Unsuspend Website - CyberPanel"
-msgstr "Suspend/Unsuspend sajt"
+msgstr ""
#: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:14
msgid "This page can be used to suspend/unsuspend website."
-msgstr "Ova stranica može poslužiti da suspendujete ili desuspendujete sajt"
+msgstr ""
#: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:44
msgid "Suspend"
@@ -2328,7 +2636,7 @@ msgstr "Nije moguće suspendovati web sajt, greška: "
#: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:69
msgid "Cannot unsuspend website. Error message:"
-msgstr "Nije moguće unsuspendirati web sajt, greška: "
+msgstr ""
#: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:73
msgid "Website "
@@ -2340,7 +2648,7 @@ msgstr "Uspješno "
#: websiteFunctions/templates/websiteFunctions/website.html:15
msgid "All functions related to a particular site."
-msgstr "Sve funkcije su povezane sa specifičnim sajtom."
+msgstr ""
#: websiteFunctions/templates/websiteFunctions/website.html:23
msgid "Resource Usage"
@@ -2359,6 +2667,18 @@ msgstr "Dopušteno"
msgid "Bandwidth Usage"
msgstr "Upotreba jesečnog protoka"
+#: websiteFunctions/templates/websiteFunctions/website.html:119
+#, fuzzy
+#| msgid "Access Logs"
+msgid "Load Access Logs"
+msgstr "Pristupni logovi"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:131
+#, fuzzy
+#| msgid "Error Logs"
+msgid "Load Error Logs"
+msgstr "Log grešaka"
+
#: websiteFunctions/templates/websiteFunctions/website.html:147
msgid "Logs Fetched"
msgstr "Logovi"
@@ -2367,8 +2687,6 @@ msgstr "Logovi"
msgid ""
"Could not fetch logs, see the logs file through command line. Error message:"
msgstr ""
-"Nije moguće izvaditi logove. Koristite komandnu liniju da biste pogledali "
-"datoteku loga."
#: websiteFunctions/templates/websiteFunctions/website.html:173
msgid "Next"
@@ -2378,84 +2696,161 @@ msgstr "Sljedeće"
msgid "Previous"
msgstr "Prethodno"
-#: websiteFunctions/templates/websiteFunctions/website.html:227
-msgid "Configurations"
-msgstr "Upravljajte postavkama"
+#: websiteFunctions/templates/websiteFunctions/website.html:230
+#: websiteFunctions/templates/websiteFunctions/website.html:232
+#, fuzzy
+#| msgid "Add Destination"
+msgid "Add Domains"
+msgstr "Dodaj destinaciju"
-#: websiteFunctions/templates/websiteFunctions/website.html:235
-msgid "Edit vHost Main Configurations"
-msgstr ""
-
-#: websiteFunctions/templates/websiteFunctions/website.html:247
-msgid "Add Rewrite Rules (.htaccess)"
-msgstr "Dodaj rewrite pravila (.htaccess)"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:259
-msgid "Add SSL"
-msgstr "Dodaj SSL"
+#: websiteFunctions/templates/websiteFunctions/website.html:242
+#: websiteFunctions/templates/websiteFunctions/website.html:244
+#, fuzzy
+#| msgid "Select Domain"
+msgid "List Domains"
+msgstr "Odaberite domene"
#: websiteFunctions/templates/websiteFunctions/website.html:274
-msgid "SSL Saved"
-msgstr "SLL spremljen"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:279
-msgid "Could not save SSL. Error message:"
-msgstr ""
-
-#: websiteFunctions/templates/websiteFunctions/website.html:329
-msgid "Current configuration in the file fetched."
-msgstr ""
-
-#: websiteFunctions/templates/websiteFunctions/website.html:334
-#: websiteFunctions/templates/websiteFunctions/website.html:347
-msgid "Could not fetch current configuration. Error message:"
-msgstr ""
-
-#: websiteFunctions/templates/websiteFunctions/website.html:343
-#: websiteFunctions/templates/websiteFunctions/website.html:398
-msgid "Configuration saved. Restart LiteSpeed put them in effect."
-msgstr ""
-
-#: websiteFunctions/templates/websiteFunctions/website.html:384
-msgid "Current rewrite rules in the file fetched."
-msgstr "Trenutno rewrite pravilo je dohvaćeno."
-
-#: websiteFunctions/templates/websiteFunctions/website.html:389
-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:402
-msgid "Could not save rewrite rules. Error message:"
-msgstr "Nisam mogao promijeniti vrijednost rewrite pravila. Poruka s greškom:"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:418
-msgid "Save Rewrite Rules"
-msgstr "Sačuvaj promjene"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:441
-msgid "Files"
-msgstr "Datoteke"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:450
-msgid "File Manager"
-msgstr "Upravljač datotekama"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:490
-msgid "Application Installer"
-msgstr "Instalacija aplikacija"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:498
-msgid "Wordpress with LSCache"
-msgstr "Wordpress sa LSCache"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:510
+#: websiteFunctions/templates/websiteFunctions/website.html:733
msgid "Path"
msgstr "Putanja"
-#: websiteFunctions/templates/websiteFunctions/website.html:532
+#: websiteFunctions/templates/websiteFunctions/website.html:276
+msgid "This path is relative to: "
+msgstr ""
+
+#: websiteFunctions/templates/websiteFunctions/website.html:276
+msgid "Leave empty to set default."
+msgstr ""
+
+#: websiteFunctions/templates/websiteFunctions/website.html:317
+#, fuzzy
+#| msgid "Create Email"
+msgid "Create Domain"
+msgstr "Kreiraj email"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:360
+#, fuzzy
+#| msgid "Version Management"
+msgid "PHP Version Changed to:"
+msgstr "Upravljanje verzijama"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:364
+#, fuzzy
+#| msgid "Delete"
+msgid "Deleted:"
+msgstr "Briši"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:368
+#, fuzzy
+#| msgid "SSL Issued for"
+msgid "SSL Issued:"
+msgstr "SSL izdat za "
+
+#: websiteFunctions/templates/websiteFunctions/website.html:391
+msgid "Close"
+msgstr ""
+
+#: websiteFunctions/templates/websiteFunctions/website.html:423
+#, fuzzy
+#| msgid "Issue SSL"
+msgid "Issue"
+msgstr "Izdavanje SSL"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:451
+msgid "Configurations"
+msgstr "Upravljajte postavkama"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:457
+#, fuzzy
+#| msgid "Edit PHP Configurations"
+msgid "Edit Virtual Host Main Configurations"
+msgstr "Izmijeni PHP konfiguracije"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:459
+msgid "Edit vHost Main Configurations"
+msgstr ""
+
+#: websiteFunctions/templates/websiteFunctions/website.html:469
+#: websiteFunctions/templates/websiteFunctions/website.html:471
+msgid "Add Rewrite Rules (.htaccess)"
+msgstr ""
+
+#: websiteFunctions/templates/websiteFunctions/website.html:481
+#, fuzzy
+#| msgid "Add SSL"
+msgid "Add Your Own SSL"
+msgstr "Dodaj SSL"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:483
+msgid "Add SSL"
+msgstr "Dodaj SSL"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:498
+msgid "SSL Saved"
+msgstr "SLL spremljen"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:503
+msgid "Could not save SSL. Error message:"
+msgstr ""
+
+#: websiteFunctions/templates/websiteFunctions/website.html:553
+msgid "Current configuration in the file fetched."
+msgstr ""
+
+#: websiteFunctions/templates/websiteFunctions/website.html:558
+#: websiteFunctions/templates/websiteFunctions/website.html:571
+msgid "Could not fetch current configuration. Error message:"
+msgstr ""
+
+#: websiteFunctions/templates/websiteFunctions/website.html:567
+#: websiteFunctions/templates/websiteFunctions/website.html:622
+msgid "Configuration saved. Restart LiteSpeed put them in effect."
+msgstr ""
+
+#: websiteFunctions/templates/websiteFunctions/website.html:608
+msgid "Current rewrite rules in the file fetched."
+msgstr "Trenutno rewrite pravilo je dohvaćeno."
+
+#: websiteFunctions/templates/websiteFunctions/website.html:613
+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
+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
+msgid "Save Rewrite Rules"
+msgstr "Sačuvaj promjene"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:665
+msgid "Files"
+msgstr "Datoteke"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:672
+#: websiteFunctions/templates/websiteFunctions/website.html:674
+msgid "File Manager"
+msgstr "Upravljač datotekama"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:713
+msgid "Application Installer"
+msgstr "Instalacija aplikacija"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:719
+#, fuzzy
+#| msgid "Wordpress with LSCache"
+msgid "Install wordpress with LSCache"
+msgstr "Wordpress sa LSCache"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:721
+msgid "Wordpress with LSCache"
+msgstr "Wordpress sa LSCache"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:755
msgid "Installation failed. Error message:"
msgstr "Nije uspjela instalacija. Greška:"
-#: websiteFunctions/templates/websiteFunctions/website.html:536
+#: websiteFunctions/templates/websiteFunctions/website.html:759
msgid "Installation successful. To complete the setup visit:"
msgstr "Instalacija je uspjela. Do završetka je ostalo samo da posjetite:"
diff --git a/locale/cn/LC_MESSAGES/django.mo b/locale/cn/LC_MESSAGES/django.mo
index 2c1d1f2fd..9eebaa1bf 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 b855a2161..e1e65a925 100644
--- a/locale/cn/LC_MESSAGES/django.po
+++ b/locale/cn/LC_MESSAGES/django.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: CyberPanel\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-22 13:33+0500\n"
+"POT-Creation-Date: 2017-10-29 20:47+0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -30,25 +30,25 @@ msgid "English"
msgstr "英语"
#: CyberCP/settings.py:168
-msgid "Urdu"
-msgstr "乌尔都语"
-
-#: CyberCP/settings.py:169
msgid "Chinese"
msgstr "中文"
-#: CyberCP/settings.py:170
+#: CyberCP/settings.py:169
msgid "Bulgarian"
msgstr "保加利亚语"
-#: CyberCP/settings.py:171
+#: CyberCP/settings.py:170
msgid "Portuguese"
msgstr "葡萄牙语"
-#: CyberCP/settings.py:172
+#: CyberCP/settings.py:171
msgid "Japanese"
msgstr "日语"
+#: CyberCP/settings.py:172
+msgid "Bosnian"
+msgstr ""
+
#: backup/templates/backup/backup.html:3 backup/templates/backup/backup.html:13
#: backup/templates/backup/backup.html:20
msgid "Back up Website"
@@ -115,7 +115,7 @@ msgstr "创建备份"
#: backup/templates/backup/backup.html:101
#: backup/templates/backup/backupDestinations.html:90
#: backup/templates/backup/backupSchedule.html:89
-#: databases/templates/databases/listDataBases.html:86
+#: databases/templates/databases/listDataBases.html:87
#: dns/templates/dns/addDeleteDNSRecords.html:129
#: firewall/templates/firewall/firewall.html:127
#: ftp/templates/ftp/listFTPAccounts.html:87
@@ -142,6 +142,7 @@ msgstr "大小"
#: dns/templates/dns/addDeleteDNSRecords.html:134
#: firewall/templates/firewall/firewall.html:131
#: firewall/templates/firewall/secureSSH.html:122
+#: websiteFunctions/templates/websiteFunctions/website.html:424
msgid "Delete"
msgstr "删除"
@@ -164,6 +165,7 @@ msgid "On this page you can set up your Back up destinations. (SFTP)"
msgstr "这里是远程备份页面(SFTP)"
#: backup/templates/backup/backupDestinations.html:30
+#: backup/templates/backup/remoteBackups.html:29
#: dns/templates/dns/addDeleteDNSRecords.html:60
#: dns/templates/dns/createNameServer.html:48
#: dns/templates/dns/createNameServer.html:65
@@ -171,8 +173,9 @@ msgid "IP Address"
msgstr "IP地址"
#: backup/templates/backup/backupDestinations.html:38
+#: backup/templates/backup/remoteBackups.html:37
#: databases/templates/databases/createDatabase.html:58
-#: databases/templates/databases/listDataBases.html:89
+#: databases/templates/databases/listDataBases.html:90
#: ftp/templates/ftp/listFTPAccounts.html:91
#: mailServer/templates/mailServer/changeEmailPassword.html:52
#: mailServer/templates/mailServer/createEmailAccount.html:51
@@ -225,10 +228,12 @@ msgstr "远程目录已添加"
#: userManagment/templates/userManagment/modifyUser.html:139
#: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:77
#: websiteFunctions/templates/websiteFunctions/website.html:157
-#: websiteFunctions/templates/websiteFunctions/website.html:284
-#: websiteFunctions/templates/websiteFunctions/website.html:339
-#: websiteFunctions/templates/websiteFunctions/website.html:394
-#: websiteFunctions/templates/websiteFunctions/website.html:542
+#: 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
msgid "Could not connect to server. Please refresh this page."
msgstr "无法连接到服务器, 请刷新此页面"
@@ -337,6 +342,101 @@ msgstr "还原备份"
msgid "Restore"
msgstr "还原"
+#: backup/templates/backup/remoteBackups.html:3
+#, fuzzy
+#| msgid "Websites Hosted - CyberPanel"
+msgid "Transfer Websites from Remote Server - CyberPanel"
+msgstr "当前已创建的网站 - CyberPanel"
+
+#: backup/templates/backup/remoteBackups.html:14
+#: backup/templates/backup/remoteBackups.html:21
+#, fuzzy
+#| msgid "Restore Back up"
+msgid "Remote Backups"
+msgstr "还原备份"
+
+#: backup/templates/backup/remoteBackups.html:15
+msgid "This feature can import website(s) from remote server"
+msgstr ""
+
+#: backup/templates/backup/remoteBackups.html:46
+#, fuzzy
+#| msgid "FTP Accounts"
+msgid "Fetch Accounts"
+msgstr "FTP用户数量"
+
+#: backup/templates/backup/remoteBackups.html:55
+msgid "Start Transfer"
+msgstr ""
+
+#: backup/templates/backup/remoteBackups.html:59
+#: websiteFunctions/templates/websiteFunctions/website.html:269
+#, fuzzy
+#| msgid "Create Back up"
+msgid "Cancel"
+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 "成功读取记录"
+
+#: backup/templates/backup/remoteBackups.html:80
+#, fuzzy
+#| msgid " is successfully created."
+msgid "Backup Process successfully started."
+msgstr " 已成功创建"
+
+#: backup/templates/backup/remoteBackups.html:84
+#, fuzzy
+#| msgid "is successfully created."
+msgid "Backup successfully cancelled."
+msgstr "已成功添加"
+
+#: backup/templates/backup/remoteBackups.html:96
+#, fuzzy
+#| msgid "Select Account"
+msgid "Search Accounts.."
+msgstr "选择用户"
+
+#: backup/templates/backup/remoteBackups.html:107
+#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:65
+msgid "Website"
+msgstr "网站"
+
+#: backup/templates/backup/remoteBackups.html:108
+#: baseTemplate/templates/baseTemplate/homePage.html:331
+#: baseTemplate/templates/baseTemplate/index.html:625
+#: baseTemplate/templates/baseTemplate/index.html:627
+#: managePHP/templates/managePHP/installExtensions.html:62
+msgid "PHP"
+msgstr "PHP"
+
+#: backup/templates/backup/remoteBackups.html:109
+#: packages/templates/packages/createPackage.html:99
+#: packages/templates/packages/deletePackage.html:63
+#: packages/templates/packages/modifyPackage.html:112
+msgid "Package"
+msgstr "套餐"
+
+#: backup/templates/backup/remoteBackups.html:110
+#: baseTemplate/templates/baseTemplate/index.html:514
+#: baseTemplate/templates/baseTemplate/index.html:516
+#: userManagment/templates/userManagment/createUser.html:47
+#: userManagment/templates/userManagment/modifyUser.html:54
+#: userManagment/templates/userManagment/userProfile.html:50
+#: websiteFunctions/templates/websiteFunctions/createWebsite.html:60
+#: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:67
+msgid "Email"
+msgstr "Email"
+
#: backup/templates/backup/restore.html:3
msgid "Restore Website - CyberPanel"
msgstr "还原网站 - Cyberpanel"
@@ -361,6 +461,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
#: managePHP/templates/managePHP/editPHPConfig.html:212
msgid "Error message:"
@@ -466,8 +567,8 @@ msgstr "数据库功能"
#: baseTemplate/templates/baseTemplate/index.html:477
#: baseTemplate/templates/baseTemplate/index.html:478
#: baseTemplate/templates/baseTemplate/index.html:479
-#: packages/templates/packages/createPackage.html:59
-#: packages/templates/packages/modifyPackage.html:63
+#: packages/templates/packages/createPackage.html:67
+#: packages/templates/packages/modifyPackage.html:73
#: websiteFunctions/templates/websiteFunctions/website.html:44
msgid "Databases"
msgstr "数据库"
@@ -498,8 +599,8 @@ msgstr "FTP"
#: baseTemplate/templates/baseTemplate/homePage.html:278
#: baseTemplate/templates/baseTemplate/homePage.html:281
-#: packages/templates/packages/createPackage.html:67
-#: packages/templates/packages/modifyPackage.html:70
+#: packages/templates/packages/createPackage.html:75
+#: packages/templates/packages/modifyPackage.html:80
msgid "Emails"
msgstr "Emails"
@@ -524,13 +625,6 @@ msgstr "服务器状态"
msgid "PHP Configurations"
msgstr "设置PHP参数"
-#: baseTemplate/templates/baseTemplate/homePage.html:331
-#: baseTemplate/templates/baseTemplate/index.html:625
-#: baseTemplate/templates/baseTemplate/index.html:627
-#: managePHP/templates/managePHP/installExtensions.html:62
-msgid "PHP"
-msgstr "PHP"
-
#: baseTemplate/templates/baseTemplate/homePage.html:340
#: baseTemplate/templates/baseTemplate/homePage.html:343
#: baseTemplate/templates/baseTemplate/index.html:643
@@ -704,7 +798,7 @@ msgstr "删除网站"
#: baseTemplate/templates/baseTemplate/index.html:468
#: packages/templates/packages/createPackage.html:13
-#: packages/templates/packages/createPackage.html:76
+#: packages/templates/packages/createPackage.html:84
#: packages/templates/packages/index.html:25
#: packages/templates/packages/index.html:27
msgid "Create Package"
@@ -724,7 +818,7 @@ msgstr "删除套餐"
#: packages/templates/packages/index.html:51
#: packages/templates/packages/modifyPackage.html:9
#: packages/templates/packages/modifyPackage.html:15
-#: packages/templates/packages/modifyPackage.html:85
+#: packages/templates/packages/modifyPackage.html:95
msgid "Modify Package"
msgstr "修改套餐"
@@ -788,16 +882,6 @@ msgstr "删除DNS区域"
msgid "Add/Delete Records"
msgstr "添加/删除记录"
-#: baseTemplate/templates/baseTemplate/index.html:514
-#: baseTemplate/templates/baseTemplate/index.html:516
-#: userManagment/templates/userManagment/createUser.html:47
-#: userManagment/templates/userManagment/modifyUser.html:54
-#: userManagment/templates/userManagment/userProfile.html:50
-#: websiteFunctions/templates/websiteFunctions/createWebsite.html:60
-#: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:67
-msgid "Email"
-msgstr "Email"
-
#: baseTemplate/templates/baseTemplate/index.html:521
#: mailServer/templates/mailServer/createEmailAccount.html:12
#: mailServer/templates/mailServer/createEmailAccount.html:19
@@ -825,7 +909,7 @@ msgid "Delete Email"
msgstr "删除Email"
#: baseTemplate/templates/baseTemplate/index.html:523
-#: databases/templates/databases/listDataBases.html:72
+#: databases/templates/databases/listDataBases.html:73
#: ftp/templates/ftp/listFTPAccounts.html:73
#: mailServer/templates/mailServer/changeEmailPassword.html:64
#: mailServer/templates/mailServer/index.html:49
@@ -841,7 +925,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:461
+#: websiteFunctions/templates/websiteFunctions/website.html:683
+#: websiteFunctions/templates/websiteFunctions/website.html:685
msgid "Create FTP Account"
msgstr "创建FTP用户"
@@ -850,7 +935,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:473
+#: websiteFunctions/templates/websiteFunctions/website.html:695
+#: websiteFunctions/templates/websiteFunctions/website.html:697
msgid "Delete FTP Account"
msgstr "删除FTP用户"
@@ -1040,7 +1126,7 @@ msgid "Create a new database on this page."
msgstr "在此页面创建数据库"
#: databases/templates/databases/createDatabase.html:42
-#: databases/templates/databases/listDataBases.html:87
+#: databases/templates/databases/listDataBases.html:88
msgid "Database Name"
msgstr "数据库名字"
@@ -1105,21 +1191,27 @@ msgstr "选择域名"
msgid "Records successfully fetched for"
msgstr "成功读取记录"
-#: databases/templates/databases/listDataBases.html:53
+#: databases/templates/databases/listDataBases.html:50
+#, fuzzy
+#| msgid "Password changed for"
+msgid "Password changed for: "
+msgstr "已为修改密码"
+
+#: databases/templates/databases/listDataBases.html:54
msgid "Cannot change password for "
msgstr "无法为修改密码 "
-#: databases/templates/databases/listDataBases.html:58
+#: databases/templates/databases/listDataBases.html:59
#: firewall/templates/firewall/firewall.html:166
#: ftp/templates/ftp/listFTPAccounts.html:59
msgid "Could Not Connect to server. Please refresh this page"
msgstr "无法连接到服务器, 请刷新此页面"
-#: databases/templates/databases/listDataBases.html:88
+#: databases/templates/databases/listDataBases.html:89
msgid "Database User"
msgstr "数据库用户"
-#: databases/templates/databases/listDataBases.html:97
+#: databases/templates/databases/listDataBases.html:98
#: ftp/templates/ftp/listFTPAccounts.html:100
msgid "Change"
msgstr "修改"
@@ -1162,6 +1254,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
msgid "Domain Name"
msgstr "域名"
@@ -1386,9 +1479,10 @@ msgid "Secure SSH - CyberPanel"
msgstr "SSH加固 - CyberPanel"
#: firewall/templates/firewall/secureSSH.html:14
-#: managePHP/templates/managePHP/editPHPConfig.html:15
-msgid "Edit PHP Configurations on this page."
-msgstr "在此页面设置PHP参数"
+#, fuzzy
+#| msgid "SSH Configurations Saved."
+msgid "Secure or harden SSH Configurations."
+msgstr "SSH设置已保存"
#: firewall/templates/firewall/secureSSH.html:28
#: managePHP/templates/managePHP/editPHPConfig.html:29
@@ -1433,8 +1527,8 @@ msgstr "添加密钥"
#: firewall/templates/firewall/secureSSH.html:158
#: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:55
-#: websiteFunctions/templates/websiteFunctions/website.html:303
-#: websiteFunctions/templates/websiteFunctions/website.html:363
+#: websiteFunctions/templates/websiteFunctions/website.html:527
+#: websiteFunctions/templates/websiteFunctions/website.html:587
msgid "Save"
msgstr "保存"
@@ -1623,6 +1717,10 @@ msgstr "设置PHP参数 - CyberPanel"
msgid "Edit PHP Configurations"
msgstr "设置PHP参数"
+#: managePHP/templates/managePHP/editPHPConfig.html:15
+msgid "Edit PHP Configurations on this page."
+msgstr "在此页面设置PHP参数"
+
#: managePHP/templates/managePHP/editPHPConfig.html:35
msgid "Advanced"
msgstr "高级"
@@ -1633,6 +1731,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
msgid "Select PHP"
msgstr "选择PHP版本"
@@ -1813,38 +1912,47 @@ msgid "Package Name"
msgstr "套餐名称"
#: packages/templates/packages/createPackage.html:35
-#: packages/templates/packages/modifyPackage.html:39
+#: packages/templates/packages/modifyPackage.html:40
+#: websiteFunctions/templates/websiteFunctions/website.html:223
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Domains"
+msgstr "域名"
+
+#: packages/templates/packages/createPackage.html:39
+#: packages/templates/packages/modifyPackage.html:44
+#, fuzzy
+#| msgid "( 0 = Unlimited )"
+msgid "(0 = Unlimited)"
+msgstr "(0为无限制 )"
+
+#: packages/templates/packages/createPackage.html:43
+#: packages/templates/packages/modifyPackage.html:49
msgid "Disk Space"
msgstr "硬盘空间"
-#: packages/templates/packages/createPackage.html:39
#: packages/templates/packages/createPackage.html:47
-#: packages/templates/packages/modifyPackage.html:43
-#: packages/templates/packages/modifyPackage.html:51
+#: packages/templates/packages/createPackage.html:55
+#: packages/templates/packages/modifyPackage.html:53
+#: packages/templates/packages/modifyPackage.html:61
msgid "MB (0 = Unlimited)"
msgstr "MB (0为无限制)"
-#: packages/templates/packages/createPackage.html:43
-#: packages/templates/packages/modifyPackage.html:47
+#: packages/templates/packages/createPackage.html:51
+#: packages/templates/packages/modifyPackage.html:57
msgid "Bandwidth"
msgstr "流量"
-#: packages/templates/packages/createPackage.html:52
-#: packages/templates/packages/modifyPackage.html:56
+#: packages/templates/packages/createPackage.html:60
+#: packages/templates/packages/modifyPackage.html:66
msgid "FTP Accounts"
msgstr "FTP用户数量"
-#: packages/templates/packages/createPackage.html:87
+#: packages/templates/packages/createPackage.html:95
msgid "Cannot create package. Error message:"
msgstr "无法创建套餐, 错误信息: "
-#: packages/templates/packages/createPackage.html:91
-#: packages/templates/packages/deletePackage.html:63
-#: packages/templates/packages/modifyPackage.html:102
-msgid "Package"
-msgstr "套餐"
-
-#: packages/templates/packages/createPackage.html:91
+#: packages/templates/packages/createPackage.html:99
msgid "Successfully Created"
msgstr "已成功创建"
@@ -1876,15 +1984,15 @@ msgstr "套餐 - CyberPanel"
msgid "Modify Package - CyberPanel"
msgstr "修改套餐 - CyberPanel"
-#: packages/templates/packages/modifyPackage.html:94
+#: packages/templates/packages/modifyPackage.html:104
msgid "Cannot fetch package details. Error message:"
msgstr "无法获取套餐资料, 错误信息: "
-#: packages/templates/packages/modifyPackage.html:98
+#: packages/templates/packages/modifyPackage.html:108
msgid "Package Details Successfully Fetched"
msgstr "套餐详情成功读取"
-#: packages/templates/packages/modifyPackage.html:102
+#: packages/templates/packages/modifyPackage.html:112
msgid "Successfully Modified"
msgstr "已成功修改"
@@ -2390,14 +2498,18 @@ msgid "Select Owner"
msgstr "选择拥有者"
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:56
+#: websiteFunctions/templates/websiteFunctions/website.html:267
+#: websiteFunctions/templates/websiteFunctions/website.html:278
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
msgid "Additional Features"
msgstr "额外功能"
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:91
+#: websiteFunctions/templates/websiteFunctions/website.html:306
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."
@@ -2406,14 +2518,17 @@ msgstr ""
"之后添加自有证书或重新申请签发Let's Encrypt证书"
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:113
+#: websiteFunctions/templates/websiteFunctions/website.html:328
msgid "Cannot create website. Error message:"
msgstr "无法创建网站, 错误信息: "
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:117
+#: websiteFunctions/templates/websiteFunctions/website.html:332
msgid "Website with domain"
msgstr "网站域名"
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:117
+#: websiteFunctions/templates/websiteFunctions/website.html:332
msgid " is Successfully Created"
msgstr " 已成功创建"
@@ -2431,10 +2546,6 @@ msgstr "在此页面可以删除网站,此操作不可逆 "
msgid "Cannot delete website, Error message: "
msgstr "无法删除网站, 错误信息: "
-#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:65
-msgid "Website"
-msgstr "网站"
-
#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:65
msgid "Successfully Deleted."
msgstr "成功删除"
@@ -2564,97 +2675,166 @@ msgstr "下一个"
msgid "Previous"
msgstr "上一个"
-#: websiteFunctions/templates/websiteFunctions/website.html:227
+#: websiteFunctions/templates/websiteFunctions/website.html:230
+#: websiteFunctions/templates/websiteFunctions/website.html:232
+#, fuzzy
+#| msgid "Add Destination"
+msgid "Add Domains"
+msgstr "添加远程目录"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:242
+#: websiteFunctions/templates/websiteFunctions/website.html:244
+#, fuzzy
+#| msgid "Select Domain"
+msgid "List Domains"
+msgstr "选择域名"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:274
+#: websiteFunctions/templates/websiteFunctions/website.html:733
+msgid "Path"
+msgstr "路径"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:276
+msgid "This path is relative to: "
+msgstr ""
+
+#: websiteFunctions/templates/websiteFunctions/website.html:276
+#, fuzzy
+#| msgid "Leave empty to select default home directory."
+msgid "Leave empty to set default."
+msgstr "留空则设置为默认根目录"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:317
+#, fuzzy
+#| msgid "Create Email"
+msgid "Create Domain"
+msgstr "创建Email"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:360
+#, fuzzy
+#| msgid "Version Management"
+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 "已为签发证书"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:391
+msgid "Close"
+msgstr ""
+
+#: websiteFunctions/templates/websiteFunctions/website.html:423
+#, fuzzy
+#| msgid "Issue SSL"
+msgid "Issue"
+msgstr "签发SSL证书"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:451
msgid "Configurations"
msgstr "配置"
-#: websiteFunctions/templates/websiteFunctions/website.html:233
+#: websiteFunctions/templates/websiteFunctions/website.html:457
#, fuzzy
#| msgid "Edit vHost Main Configurations"
msgid "Edit Virtual Host Main Configurations"
msgstr "编辑vHost主配置"
-#: websiteFunctions/templates/websiteFunctions/website.html:235
+#: websiteFunctions/templates/websiteFunctions/website.html:459
msgid "Edit vHost Main Configurations"
msgstr "编辑vHost主配置"
-#: websiteFunctions/templates/websiteFunctions/website.html:245
-#: websiteFunctions/templates/websiteFunctions/website.html:247
+#: websiteFunctions/templates/websiteFunctions/website.html:469
+#: websiteFunctions/templates/websiteFunctions/website.html:471
msgid "Add Rewrite Rules (.htaccess)"
msgstr "添加Rewrite Rules (.htaccess)"
-#: websiteFunctions/templates/websiteFunctions/website.html:257
+#: websiteFunctions/templates/websiteFunctions/website.html:481
#, fuzzy
#| msgid "Add SSL"
msgid "Add Your Own SSL"
msgstr "添加SSL证书"
-#: websiteFunctions/templates/websiteFunctions/website.html:259
+#: websiteFunctions/templates/websiteFunctions/website.html:483
msgid "Add SSL"
msgstr "添加SSL证书"
-#: websiteFunctions/templates/websiteFunctions/website.html:274
+#: websiteFunctions/templates/websiteFunctions/website.html:498
msgid "SSL Saved"
msgstr "SSL证书已保存"
-#: websiteFunctions/templates/websiteFunctions/website.html:279
+#: websiteFunctions/templates/websiteFunctions/website.html:503
msgid "Could not save SSL. Error message:"
msgstr "无法保存SSL证书, 错误信息: "
-#: websiteFunctions/templates/websiteFunctions/website.html:329
+#: websiteFunctions/templates/websiteFunctions/website.html:553
msgid "Current configuration in the file fetched."
msgstr "当前配置读取成功"
-#: websiteFunctions/templates/websiteFunctions/website.html:334
-#: websiteFunctions/templates/websiteFunctions/website.html:347
+#: websiteFunctions/templates/websiteFunctions/website.html:558
+#: websiteFunctions/templates/websiteFunctions/website.html:571
msgid "Could not fetch current configuration. Error message:"
msgstr "无法读取当前配置, 错误信息: "
-#: websiteFunctions/templates/websiteFunctions/website.html:343
-#: websiteFunctions/templates/websiteFunctions/website.html:398
+#: websiteFunctions/templates/websiteFunctions/website.html:567
+#: websiteFunctions/templates/websiteFunctions/website.html:622
msgid "Configuration saved. Restart LiteSpeed put them in effect."
msgstr "配置已保存, 重启LiteSpeed以生效"
-#: websiteFunctions/templates/websiteFunctions/website.html:384
+#: websiteFunctions/templates/websiteFunctions/website.html:608
msgid "Current rewrite rules in the file fetched."
msgstr "当前Rewrite rules读取成功"
-#: websiteFunctions/templates/websiteFunctions/website.html:389
+#: websiteFunctions/templates/websiteFunctions/website.html:613
msgid "Could not fetch current rewrite rules. Error message:"
msgstr "无法读取当前Rewrite rules, 错误信息: "
-#: websiteFunctions/templates/websiteFunctions/website.html:402
+#: websiteFunctions/templates/websiteFunctions/website.html:626
msgid "Could not save rewrite rules. Error message:"
msgstr "无法保存Rewrite rules, 错误信息: "
-#: websiteFunctions/templates/websiteFunctions/website.html:418
+#: websiteFunctions/templates/websiteFunctions/website.html:642
msgid "Save Rewrite Rules"
msgstr "保存Rewrite rules"
-#: websiteFunctions/templates/websiteFunctions/website.html:441
+#: websiteFunctions/templates/websiteFunctions/website.html:665
msgid "Files"
msgstr "文件"
-#: websiteFunctions/templates/websiteFunctions/website.html:450
+#: websiteFunctions/templates/websiteFunctions/website.html:672
+#: websiteFunctions/templates/websiteFunctions/website.html:674
msgid "File Manager"
msgstr "文件管理"
-#: websiteFunctions/templates/websiteFunctions/website.html:490
+#: websiteFunctions/templates/websiteFunctions/website.html:713
msgid "Application Installer"
msgstr "应用安装器"
-#: websiteFunctions/templates/websiteFunctions/website.html:498
+#: websiteFunctions/templates/websiteFunctions/website.html:719
+#, fuzzy
+#| msgid "Wordpress with LSCache"
+msgid "Install wordpress with LSCache"
+msgstr "Wordpress和LS Cache"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:721
msgid "Wordpress with LSCache"
msgstr "Wordpress和LS Cache"
-#: websiteFunctions/templates/websiteFunctions/website.html:510
-msgid "Path"
-msgstr "路径"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:532
+#: websiteFunctions/templates/websiteFunctions/website.html:755
msgid "Installation failed. Error message:"
msgstr "安装失败, 错误信息: "
-#: websiteFunctions/templates/websiteFunctions/website.html:536
+#: websiteFunctions/templates/websiteFunctions/website.html:759
msgid "Installation successful. To complete the setup visit:"
msgstr "安装成功, 请访问网站以完成设置"
+
+#~ msgid "Urdu"
+#~ msgstr "乌尔都语"
diff --git a/locale/ja/LC_MESSAGES/django.mo b/locale/ja/LC_MESSAGES/django.mo
index ff9c16324..c01a17fd2 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 14aac1f68..dca189574 100644
--- a/locale/ja/LC_MESSAGES/django.po
+++ b/locale/ja/LC_MESSAGES/django.po
@@ -3,19 +3,27 @@
# This file is distributed under the same license as the CyberPanel package.
# FIRST AUTHOR , 2017.
#
+#: baseTemplate/templates/baseTemplate/index.html:211
+#: baseTemplate/templates/baseTemplate/index.html:301
+#: baseTemplate/templates/baseTemplate/index.html:356
+#: baseTemplate/templates/baseTemplate/index.html:362
+#: baseTemplate/templates/baseTemplate/index.html:368
+#: baseTemplate/templates/baseTemplate/index.html:374
+#: baseTemplate/templates/baseTemplate/index.html:380
+#: baseTemplate/templates/baseTemplate/index.html:386
msgid ""
msgstr ""
"Project-Id-Version: CyberPanel\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-19 17:34+0500\n"
-"PO-Revision-Date: 2017-10-23 20:42+0900\n"
+"POT-Creation-Date: 2017-10-29 20:47+0500\n"
+"PO-Revision-Date: 2017-10-26 02:15+0900\n"
+"Last-Translator: @ kazuo210 \n"
"Language-Team: LANGUAGE \n"
"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"Last-Translator: @ kazuo210 \n"
"X-Generator: Poedit 2.0.4\n"
#: CyberCP/settings.py:167
@@ -26,16 +34,32 @@ msgstr "英語"
msgid "Chinese"
msgstr "中国語"
-#: backup/templates/backup/backup.html:3 backup/templates/backup/backup.html:14
-#: backup/templates/backup/backup.html:21
+#: CyberCP/settings.py:169
+msgid "Bulgarian"
+msgstr "ブルガリア語"
+
+#: CyberCP/settings.py:170
+msgid "Portuguese"
+msgstr "ポルトガル語"
+
+#: CyberCP/settings.py:171
+msgid "Japanese"
+msgstr "日本語"
+
+#: CyberCP/settings.py:172
+msgid "Bosnian"
+msgstr ""
+
+#: backup/templates/backup/backup.html:3 backup/templates/backup/backup.html:13
+#: backup/templates/backup/backup.html:20
msgid "Back up Website"
msgstr "Web サイトのバックアップ"
-#: backup/templates/backup/backup.html:15
+#: backup/templates/backup/backup.html:14
msgid "This page can be used to Back up your websites"
msgstr "このページは、Web サイトをバックアップするために使用することができます"
-#: backup/templates/backup/backup.html:30
+#: backup/templates/backup/backup.html:29
#: databases/templates/databases/createDatabase.html:28
#: databases/templates/databases/deleteDatabase.html:28
#: ftp/templates/ftp/createFTPAccount.html:28
@@ -50,23 +74,23 @@ msgstr "このページは、Web サイトをバックアップするために
msgid "Select Website"
msgstr "Web サイトを選択"
-#: backup/templates/backup/backup.html:41
+#: backup/templates/backup/backup.html:40
#: backup/templates/backup/backupSchedule.html:90
msgid "Destination"
msgstr "宛先"
-#: backup/templates/backup/backup.html:44
-#: baseTemplate/templates/baseTemplate/homePage.html:13
+#: backup/templates/backup/backup.html:43
+#: baseTemplate/templates/baseTemplate/homePage.html:12
msgid "Home"
msgstr "ホーム"
-#: backup/templates/backup/backup.html:60
+#: backup/templates/backup/backup.html:59
#: backup/templates/backup/restore.html:62
msgid "File Name"
msgstr "ファイル名"
-#: backup/templates/backup/backup.html:61
-#: backup/templates/backup/backup.html:100
+#: backup/templates/backup/backup.html:60
+#: backup/templates/backup/backup.html:105
#: backup/templates/backup/restore.html:63
#: baseTemplate/templates/baseTemplate/index.html:390
#: firewall/templates/firewall/firewall.html:36
@@ -74,19 +98,23 @@ msgstr "ファイル名"
msgid "Status"
msgstr "状態"
-#: backup/templates/backup/backup.html:66
+#: backup/templates/backup/backup.html:65
msgid "Running"
msgstr "実行中"
-#: backup/templates/backup/backup.html:81
+#: backup/templates/backup/backup.html:80
#: baseTemplate/templates/baseTemplate/index.html:561
msgid "Create Back up"
msgstr "バックアップの作成"
-#: backup/templates/backup/backup.html:96
+#: backup/templates/backup/backup.html:87
+msgid "Cancel Backup"
+msgstr "バックアップを中止"
+
+#: backup/templates/backup/backup.html:101
#: backup/templates/backup/backupDestinations.html:90
#: backup/templates/backup/backupSchedule.html:89
-#: databases/templates/databases/listDataBases.html:86
+#: databases/templates/databases/listDataBases.html:87
#: dns/templates/dns/addDeleteDNSRecords.html:129
#: firewall/templates/firewall/firewall.html:127
#: ftp/templates/ftp/listFTPAccounts.html:87
@@ -94,33 +122,34 @@ msgstr "バックアップの作成"
msgid "ID"
msgstr "ID"
-#: backup/templates/backup/backup.html:97
+#: backup/templates/backup/backup.html:102
msgid "File"
msgstr "ファイル"
-#: backup/templates/backup/backup.html:98
+#: backup/templates/backup/backup.html:103
msgid "Date"
msgstr "日付"
-#: backup/templates/backup/backup.html:99
+#: backup/templates/backup/backup.html:104
#: ftp/templates/ftp/listFTPAccounts.html:90
msgid "Size"
msgstr "サイズ"
-#: backup/templates/backup/backup.html:101
+#: backup/templates/backup/backup.html:106
#: 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/secureSSH.html:122
+#: websiteFunctions/templates/websiteFunctions/website.html:424
msgid "Delete"
msgstr "削除"
-#: backup/templates/backup/backup.html:125
+#: backup/templates/backup/backup.html:130
msgid "Cannot delete website, Error message: "
msgstr "Web サイトを削除できません、エラーメッセージ: "
-#: backup/templates/backup/backup.html:129
+#: backup/templates/backup/backup.html:134
msgid "Successfully Deleted"
msgstr "削除されました"
@@ -135,14 +164,17 @@ msgid "On this page you can set up your Back up destinations. (SFTP)"
msgstr "このページでは、バックアップ先を設定できます。 （SFTP）"
#: backup/templates/backup/backupDestinations.html:30
+#: backup/templates/backup/remoteBackups.html:29
+#: dns/templates/dns/addDeleteDNSRecords.html:60
#: dns/templates/dns/createNameServer.html:48
#: dns/templates/dns/createNameServer.html:65
msgid "IP Address"
msgstr "IP アドレス"
#: backup/templates/backup/backupDestinations.html:38
+#: backup/templates/backup/remoteBackups.html:37
#: databases/templates/databases/createDatabase.html:58
-#: databases/templates/databases/listDataBases.html:89
+#: databases/templates/databases/listDataBases.html:90
#: ftp/templates/ftp/listFTPAccounts.html:91
#: mailServer/templates/mailServer/changeEmailPassword.html:52
#: mailServer/templates/mailServer/createEmailAccount.html:51
@@ -153,6 +185,7 @@ msgstr "パスワード"
#: backup/templates/backup/backupDestinations.html:48
#: backup/templates/backup/backupSchedule.html:54
+#: baseTemplate/templates/baseTemplate/index.html:563
msgid "Add Destination"
msgstr "バックアップ先の追加"
@@ -194,10 +227,12 @@ msgstr "追加された宛先。"
#: userManagment/templates/userManagment/modifyUser.html:139
#: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:77
#: websiteFunctions/templates/websiteFunctions/website.html:157
-#: websiteFunctions/templates/websiteFunctions/website.html:284
-#: websiteFunctions/templates/websiteFunctions/website.html:339
-#: websiteFunctions/templates/websiteFunctions/website.html:394
-#: websiteFunctions/templates/websiteFunctions/website.html:542
+#: 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
msgid "Could not connect to server. Please refresh this page."
msgstr "サーバーに接続できませんでした。 このページを更新してください。"
@@ -262,8 +297,11 @@ 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:270
+#: baseTemplate/templates/baseTemplate/homePage.html:266
+#: baseTemplate/templates/baseTemplate/homePage.html:269
+#: baseTemplate/templates/baseTemplate/index.html:554
#: baseTemplate/templates/baseTemplate/index.html:556
+#: baseTemplate/templates/baseTemplate/index.html:572
msgid "Back up"
msgstr "バックアップ"
@@ -272,7 +310,7 @@ msgid "Back up and restore sites."
msgstr "バックアップし、サイトを復元します。"
#: backup/templates/backup/index.html:19
-#: baseTemplate/templates/baseTemplate/homePage.html:165
+#: baseTemplate/templates/baseTemplate/homePage.html:164
#: databases/templates/databases/index.html:19 dns/templates/dns/index.html:19
#: firewall/templates/firewall/index.html:19 ftp/templates/ftp/index.html:19
#: mailServer/templates/mailServer/index.html:19
@@ -287,11 +325,115 @@ msgstr "バックアップし、サイトを復元します。"
msgid "Available Functions"
msgstr "使用可能な機能"
+#: backup/templates/backup/index.html:27 backup/templates/backup/index.html:43
+msgid "Back up Site"
+msgstr "サイトのバックアップ"
+
+#: backup/templates/backup/index.html:55
+#: baseTemplate/templates/baseTemplate/index.html:562
+msgid "Restore Back up"
+msgstr "バックアップの復元"
+
#: backup/templates/backup/index.html:57
#: backup/templates/backup/restore.html:45
msgid "Restore"
msgstr "復元"
+#: backup/templates/backup/remoteBackups.html:3
+#, fuzzy
+#| msgid "Websites Hosted - CyberPanel"
+msgid "Transfer Websites from Remote Server - CyberPanel"
+msgstr "ホストされているWebサイト - CyberPanel"
+
+#: backup/templates/backup/remoteBackups.html:14
+#: backup/templates/backup/remoteBackups.html:21
+#, fuzzy
+#| msgid "Restore Back up"
+msgid "Remote Backups"
+msgstr "バックアップの復元"
+
+#: backup/templates/backup/remoteBackups.html:15
+msgid "This feature can import website(s) from remote server"
+msgstr ""
+
+#: backup/templates/backup/remoteBackups.html:46
+#, fuzzy
+#| msgid "FTP Accounts"
+msgid "Fetch Accounts"
+msgstr "FTP アカウント"
+
+#: backup/templates/backup/remoteBackups.html:55
+msgid "Start Transfer"
+msgstr ""
+
+#: backup/templates/backup/remoteBackups.html:59
+#: websiteFunctions/templates/websiteFunctions/website.html:269
+#, fuzzy
+#| msgid "Cancel Backup"
+msgid "Cancel"
+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 "レコードが取得されました"
+
+#: backup/templates/backup/remoteBackups.html:80
+#, fuzzy
+#| msgid " is successfully created."
+msgid "Backup Process successfully started."
+msgstr " 作成されました。"
+
+#: backup/templates/backup/remoteBackups.html:84
+#, fuzzy
+#| msgid "is successfully created."
+msgid "Backup successfully cancelled."
+msgstr "作成されました。"
+
+#: backup/templates/backup/remoteBackups.html:96
+#, fuzzy
+#| msgid "Select Account"
+msgid "Search Accounts.."
+msgstr "アカウントを選択"
+
+#: backup/templates/backup/remoteBackups.html:107
+#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:65
+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
+#: managePHP/templates/managePHP/installExtensions.html:62
+msgid "PHP"
+msgstr "PHP"
+
+#: backup/templates/backup/remoteBackups.html:109
+#: packages/templates/packages/createPackage.html:99
+#: packages/templates/packages/deletePackage.html:63
+#: packages/templates/packages/modifyPackage.html:112
+msgid "Package"
+msgstr "パッケージ"
+
+#: backup/templates/backup/remoteBackups.html:110
+#: baseTemplate/templates/baseTemplate/index.html:514
+#: baseTemplate/templates/baseTemplate/index.html:516
+#: userManagment/templates/userManagment/createUser.html:47
+#: userManagment/templates/userManagment/modifyUser.html:54
+#: userManagment/templates/userManagment/userProfile.html:50
+#: websiteFunctions/templates/websiteFunctions/createWebsite.html:60
+#: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:67
+msgid "Email"
+msgstr "メール"
+
#: backup/templates/backup/restore.html:3
msgid "Restore Website - CyberPanel"
msgstr "Web サイトの復元 - CyberPanel"
@@ -317,6 +459,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
#: managePHP/templates/managePHP/editPHPConfig.html:212
msgid "Error message:"
@@ -330,119 +473,162 @@ msgstr "このバックアップに関連するサイトは既に存在します
msgid "Home - CyberPanel"
msgstr "ホーム - CyberPanel"
-#: baseTemplate/templates/baseTemplate/homePage.html:14
+#: baseTemplate/templates/baseTemplate/homePage.html:13
msgid "Use the tabs to navigate through the control panel."
msgstr "タブを使用して、コントロール パネルを操作します。"
-#: baseTemplate/templates/baseTemplate/homePage.html:24
+#: baseTemplate/templates/baseTemplate/homePage.html:23
#: websiteFunctions/templates/websiteFunctions/website.html:33
msgid "Usage"
msgstr "使用量"
-#: baseTemplate/templates/baseTemplate/homePage.html:35
+#: baseTemplate/templates/baseTemplate/homePage.html:34
#: baseTemplate/templates/baseTemplate/index.html:221
msgid "CPU Usage"
msgstr "CPU の使用量"
-#: baseTemplate/templates/baseTemplate/homePage.html:56
+#: baseTemplate/templates/baseTemplate/homePage.html:55
#: baseTemplate/templates/baseTemplate/index.html:232
msgid "Ram Usage"
msgstr "Ram の使用量"
-#: baseTemplate/templates/baseTemplate/homePage.html:75
+#: baseTemplate/templates/baseTemplate/homePage.html:74
msgid "Disk Usage '/'"
msgstr "ディスクの使用量 '/'"
-#: baseTemplate/templates/baseTemplate/homePage.html:99
+#: baseTemplate/templates/baseTemplate/homePage.html:98
msgid "HTTP Statistics"
msgstr "HTTP の統計情報"
-#: baseTemplate/templates/baseTemplate/homePage.html:108
+#: baseTemplate/templates/baseTemplate/homePage.html:107
msgid "Available/Max Connections"
msgstr "利用可能/最大 接続数"
-#: baseTemplate/templates/baseTemplate/homePage.html:119
+#: baseTemplate/templates/baseTemplate/homePage.html:118
msgid "Available/Max SSL Connections"
msgstr "利用可能/最大 SSL 接続数"
-#: baseTemplate/templates/baseTemplate/homePage.html:128
+#: baseTemplate/templates/baseTemplate/homePage.html:127
msgid "Requests Processing"
msgstr "リクエスト処理数"
-#: baseTemplate/templates/baseTemplate/homePage.html:137
+#: baseTemplate/templates/baseTemplate/homePage.html:136
msgid "Total Requests"
msgstr "合計リクエスト数"
-#: baseTemplate/templates/baseTemplate/homePage.html:177
+#: baseTemplate/templates/baseTemplate/homePage.html:173
+#: userManagment/templates/userManagment/index.html:13
+msgid "User Functions"
+msgstr "ユーザ機能"
+
+#: baseTemplate/templates/baseTemplate/homePage.html:176
+#: 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:190
+#: baseTemplate/templates/baseTemplate/homePage.html:186
+#: websiteFunctions/templates/websiteFunctions/index.html:13
+msgid "Website Functions"
+msgstr "Web サイト機能"
+
+#: baseTemplate/templates/baseTemplate/homePage.html:189
#: baseTemplate/templates/baseTemplate/index.html:360
+#: baseTemplate/templates/baseTemplate/index.html:444
+#: baseTemplate/templates/baseTemplate/index.html:445
#: baseTemplate/templates/baseTemplate/index.html:446
#: websiteFunctions/templates/websiteFunctions/listWebsites.html:21
msgid "Websites"
msgstr "Web サイト"
-#: baseTemplate/templates/baseTemplate/homePage.html:203
+#: baseTemplate/templates/baseTemplate/homePage.html:199
+msgid "Add/Modify Packages"
+msgstr "パッケージの追加/変更"
+
+#: baseTemplate/templates/baseTemplate/homePage.html:202
#: baseTemplate/templates/baseTemplate/index.html:366
+#: baseTemplate/templates/baseTemplate/index.html:461
#: baseTemplate/templates/baseTemplate/index.html:463
#: packages/templates/packages/index.html:13
msgid "Packages"
msgstr "パッケージ"
-#: baseTemplate/templates/baseTemplate/homePage.html:227
+#: baseTemplate/templates/baseTemplate/homePage.html:223
+#: databases/templates/databases/index.html:12
+msgid "Database Functions"
+msgstr "データベース機能"
+
+#: baseTemplate/templates/baseTemplate/homePage.html:226
+#: baseTemplate/templates/baseTemplate/index.html:477
+#: baseTemplate/templates/baseTemplate/index.html:478
#: baseTemplate/templates/baseTemplate/index.html:479
-#: packages/templates/packages/createPackage.html:59
-#: packages/templates/packages/modifyPackage.html:63
+#: packages/templates/packages/createPackage.html:67
+#: packages/templates/packages/modifyPackage.html:73
#: websiteFunctions/templates/websiteFunctions/website.html:44
msgid "Databases"
msgstr "データベース"
-#: baseTemplate/templates/baseTemplate/homePage.html:239
+#: baseTemplate/templates/baseTemplate/homePage.html:235
+msgid "Control DNS"
+msgstr "DNS制御"
+
+#: baseTemplate/templates/baseTemplate/homePage.html:238
#: 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:252
+#: baseTemplate/templates/baseTemplate/homePage.html:248
+#: ftp/templates/ftp/index.html:12
+msgid "FTP Functions"
+msgstr "FTP 機能"
+
+#: baseTemplate/templates/baseTemplate/homePage.html:251
#: baseTemplate/templates/baseTemplate/index.html:378
+#: baseTemplate/templates/baseTemplate/index.html:536
#: baseTemplate/templates/baseTemplate/index.html:538
#: websiteFunctions/templates/websiteFunctions/website.html:39
msgid "FTP"
msgstr "FTP"
-#: baseTemplate/templates/baseTemplate/homePage.html:282
-#: packages/templates/packages/createPackage.html:67
-#: packages/templates/packages/modifyPackage.html:70
+#: baseTemplate/templates/baseTemplate/homePage.html:278
+#: baseTemplate/templates/baseTemplate/homePage.html:281
+#: packages/templates/packages/createPackage.html:75
+#: packages/templates/packages/modifyPackage.html:80
msgid "Emails"
msgstr "メール"
-#: baseTemplate/templates/baseTemplate/homePage.html:295
+#: baseTemplate/templates/baseTemplate/homePage.html:291
+#: baseTemplate/templates/baseTemplate/homePage.html:294
#: tuning/templates/tuning/index.html:12
msgid "Server Tuning"
msgstr "サーバーのチューニング"
-#: baseTemplate/templates/baseTemplate/homePage.html:319
+#: 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
#: serverStatus/templates/serverStatus/index.html:13
msgid "Server Status"
msgstr "サーバーの状態"
-#: baseTemplate/templates/baseTemplate/homePage.html:332
-#: baseTemplate/templates/baseTemplate/index.html:627
-#: managePHP/templates/managePHP/installExtensions.html:62
-msgid "PHP"
-msgstr "PHP"
+#: baseTemplate/templates/baseTemplate/homePage.html:328
+msgid "PHP Configurations"
+msgstr "PHPの設定"
-#: baseTemplate/templates/baseTemplate/homePage.html:344
+#: baseTemplate/templates/baseTemplate/homePage.html:340
+#: baseTemplate/templates/baseTemplate/homePage.html:343
#: baseTemplate/templates/baseTemplate/index.html:643
#: websiteFunctions/templates/websiteFunctions/website.html:113
msgid "Logs"
msgstr "ログ"
-#: baseTemplate/templates/baseTemplate/homePage.html:367
+#: baseTemplate/templates/baseTemplate/homePage.html:363
+#: baseTemplate/templates/baseTemplate/homePage.html:366
+#: baseTemplate/templates/baseTemplate/index.html:659
#: baseTemplate/templates/baseTemplate/index.html:661
msgid "Security"
msgstr "セキュリティ"
@@ -457,26 +643,61 @@ msgstr "CPU の状態"
msgid "Disk Usage"
msgstr "ディスクの使用量"
+#: baseTemplate/templates/baseTemplate/index.html:275
+#: baseTemplate/templates/baseTemplate/index.html:278
+#: baseTemplate/templates/baseTemplate/index.html:282
+msgid "CyberPanel"
+msgstr "CyberPanel"
+
#: baseTemplate/templates/baseTemplate/index.html:280
#: baseTemplate/templates/baseTemplate/index.html:284
msgid "Web Hosting Control Panel"
msgstr "Web ホスティングコントロールパネル"
+#: baseTemplate/templates/baseTemplate/index.html:286
+msgid "Close sidebar"
+msgstr "サイドバーを閉じる"
+
+#: baseTemplate/templates/baseTemplate/index.html:292
+msgid "My Account"
+msgstr "マイ アカウント"
+
#: baseTemplate/templates/baseTemplate/index.html:309
msgid "Edit profile"
msgstr "プロフィールの編集"
#: baseTemplate/templates/baseTemplate/index.html:310
#: baseTemplate/templates/baseTemplate/index.html:433
+#: userManagment/templates/userManagment/index.html:26
#: userManagment/templates/userManagment/index.html:28
msgid "View Profile"
msgstr "プロフィールの表示"
#: baseTemplate/templates/baseTemplate/index.html:317
+#: baseTemplate/templates/baseTemplate/index.html:398
msgid "Logout"
msgstr "ログアウト"
+#: baseTemplate/templates/baseTemplate/index.html:328
+#: baseTemplate/templates/baseTemplate/index.html:332
+#: baseTemplate/templates/baseTemplate/index.html:336
+msgid "CPU Load Average"
+msgstr "CPU 負荷平均"
+
+#: baseTemplate/templates/baseTemplate/index.html:340
+msgid "Fullscreen"
+msgstr "フルスクリーン"
+
+#: baseTemplate/templates/baseTemplate/index.html:345
+msgid "System Status"
+msgstr "システムの状態"
+
+#: baseTemplate/templates/baseTemplate/index.html:350
+msgid "Dashboard Quick Menu"
+msgstr "ダッシュボードクイックメニュー"
+
#: baseTemplate/templates/baseTemplate/index.html:384
+#: baseTemplate/templates/baseTemplate/index.html:590
#: baseTemplate/templates/baseTemplate/index.html:592
msgid "Tuning"
msgstr "チューニング"
@@ -485,10 +706,13 @@ msgstr "チューニング"
msgid "Overview"
msgstr "概要"
+#: baseTemplate/templates/baseTemplate/index.html:413
#: baseTemplate/templates/baseTemplate/index.html:415
+#: baseTemplate/templates/baseTemplate/index.html:417
msgid "Dashboard"
msgstr "ダッシュボード"
+#: baseTemplate/templates/baseTemplate/index.html:418
#: baseTemplate/templates/baseTemplate/index.html:419
#: baseTemplate/templates/baseTemplate/versionManagment.html:10
msgid "Version Management"
@@ -504,6 +728,7 @@ msgid "Create New User"
msgstr "新しいユーザーの作成"
#: baseTemplate/templates/baseTemplate/index.html:435
+#: userManagment/templates/userManagment/index.html:52
#: userManagment/templates/userManagment/index.html:54
#: userManagment/templates/userManagment/modifyUser.html:12
#: userManagment/templates/userManagment/modifyUser.html:120
@@ -514,6 +739,7 @@ msgstr "ユーザーの変更"
#: userManagment/templates/userManagment/deleteUser.html:13
#: userManagment/templates/userManagment/deleteUser.html:20
#: userManagment/templates/userManagment/deleteUser.html:42
+#: userManagment/templates/userManagment/index.html:74
#: userManagment/templates/userManagment/index.html:76
msgid "Delete User"
msgstr "ユーザーの削除"
@@ -521,17 +747,20 @@ msgstr "ユーザーの削除"
#: baseTemplate/templates/baseTemplate/index.html:451
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:12
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:102
+#: websiteFunctions/templates/websiteFunctions/index.html:26
#: websiteFunctions/templates/websiteFunctions/index.html:28
msgid "Create Website"
msgstr "Web サイトの作成"
#: baseTemplate/templates/baseTemplate/index.html:452
+#: websiteFunctions/templates/websiteFunctions/index.html:38
#: websiteFunctions/templates/websiteFunctions/index.html:40
#: websiteFunctions/templates/websiteFunctions/listWebsites.html:14
msgid "List Websites"
msgstr "Webサイトの一覧"
#: baseTemplate/templates/baseTemplate/index.html:453
+#: websiteFunctions/templates/websiteFunctions/index.html:50
#: websiteFunctions/templates/websiteFunctions/index.html:52
#: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:12
#: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:19
@@ -548,13 +777,15 @@ msgstr "休止/休止解除"
#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:12
#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:19
#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:42
+#: websiteFunctions/templates/websiteFunctions/index.html:84
#: websiteFunctions/templates/websiteFunctions/index.html:86
msgid "Delete Website"
msgstr "Web サイトの削除"
#: baseTemplate/templates/baseTemplate/index.html:468
#: packages/templates/packages/createPackage.html:13
-#: packages/templates/packages/createPackage.html:76
+#: packages/templates/packages/createPackage.html:84
+#: packages/templates/packages/index.html:25
#: packages/templates/packages/index.html:27
msgid "Create Package"
msgstr "パッケージの作成"
@@ -563,15 +794,17 @@ msgstr "パッケージの作成"
#: packages/templates/packages/deletePackage.html:12
#: packages/templates/packages/deletePackage.html:18
#: packages/templates/packages/deletePackage.html:40
+#: packages/templates/packages/index.html:37
#: packages/templates/packages/index.html:39
msgid "Delete Package"
msgstr "パッケージの削除"
#: baseTemplate/templates/baseTemplate/index.html:470
+#: packages/templates/packages/index.html:49
#: packages/templates/packages/index.html:51
#: packages/templates/packages/modifyPackage.html:9
#: packages/templates/packages/modifyPackage.html:15
-#: packages/templates/packages/modifyPackage.html:85
+#: packages/templates/packages/modifyPackage.html:95
msgid "Modify Package"
msgstr "パッケージの変更"
@@ -579,7 +812,9 @@ msgstr "パッケージの変更"
#: databases/templates/databases/createDatabase.html:12
#: databases/templates/databases/createDatabase.html:19
#: databases/templates/databases/createDatabase.html:68
+#: databases/templates/databases/index.html:25
#: databases/templates/databases/index.html:27
+#: manageSSL/templates/manageSSL/index.html:26
msgid "Create Database"
msgstr "データベースの作成"
@@ -587,11 +822,14 @@ msgstr "データベースの作成"
#: databases/templates/databases/deleteDatabase.html:12
#: databases/templates/databases/deleteDatabase.html:19
#: databases/templates/databases/deleteDatabase.html:53
+#: databases/templates/databases/index.html:37
#: databases/templates/databases/index.html:39
+#: manageSSL/templates/manageSSL/index.html:38
msgid "Delete Database"
msgstr "データベースの削除"
#: baseTemplate/templates/baseTemplate/index.html:486
+#: databases/templates/databases/index.html:53
#: databases/templates/databases/index.html:55
#: databases/templates/databases/listDataBases.html:13
#: databases/templates/databases/listDataBases.html:19
@@ -599,25 +837,29 @@ msgid "List Databases"
msgstr "データベースの一覧"
#: baseTemplate/templates/baseTemplate/index.html:487
+#: databases/templates/databases/index.html:65
#: databases/templates/databases/index.html:67
msgid "PHPMYAdmin"
msgstr "PHPMYAdmin"
#: baseTemplate/templates/baseTemplate/index.html:502
#: dns/templates/dns/createNameServer.html:12
-#: dns/templates/dns/createNameServer.html:76 dns/templates/dns/index.html:74
+#: dns/templates/dns/createNameServer.html:76 dns/templates/dns/index.html:72
+#: dns/templates/dns/index.html:74
msgid "Create Nameserver"
msgstr "ネームサーバーの作成"
#: baseTemplate/templates/baseTemplate/index.html:503
#: dns/templates/dns/createDNSZone.html:12
-#: dns/templates/dns/createDNSZone.html:40 dns/templates/dns/index.html:31
+#: dns/templates/dns/createDNSZone.html:40 dns/templates/dns/index.html:29
+#: dns/templates/dns/index.html:31 dns/templates/dns/index.html:84
#: dns/templates/dns/index.html:86
msgid "Create DNS Zone"
msgstr "DNSゾーンの作成"
#: baseTemplate/templates/baseTemplate/index.html:504
-#: dns/templates/dns/deleteDNSZone.html:40 dns/templates/dns/index.html:43
+#: dns/templates/dns/deleteDNSZone.html:40 dns/templates/dns/index.html:41
+#: dns/templates/dns/index.html:43 dns/templates/dns/index.html:96
#: dns/templates/dns/index.html:98
msgid "Delete Zone"
msgstr "ゾーンの削除"
@@ -626,31 +868,37 @@ msgstr "ゾーンの削除"
msgid "Add/Delete Records"
msgstr "レコードの追加/削除"
-#: baseTemplate/templates/baseTemplate/index.html:516
-#: userManagment/templates/userManagment/createUser.html:47
-#: userManagment/templates/userManagment/modifyUser.html:54
-#: userManagment/templates/userManagment/userProfile.html:50
-#: websiteFunctions/templates/websiteFunctions/createWebsite.html:60
-#: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:67
-msgid "Email"
-msgstr "メール"
+#: baseTemplate/templates/baseTemplate/index.html:521
+#: mailServer/templates/mailServer/createEmailAccount.html:12
+#: mailServer/templates/mailServer/createEmailAccount.html:19
+msgid "Create Email Account"
+msgstr "メールアカウントの作成"
#: baseTemplate/templates/baseTemplate/index.html:521
#: mailServer/templates/mailServer/createEmailAccount.html:64
+#: mailServer/templates/mailServer/index.html:25
#: mailServer/templates/mailServer/index.html:27
msgid "Create Email"
msgstr "メールアカウントの作成"
+#: baseTemplate/templates/baseTemplate/index.html:522
+#: mailServer/templates/mailServer/deleteEmailAccount.html:12
+#: mailServer/templates/mailServer/deleteEmailAccount.html:19
+msgid "Delete Email Account"
+msgstr "メールアカウントの削除"
+
#: baseTemplate/templates/baseTemplate/index.html:522
#: mailServer/templates/mailServer/deleteEmailAccount.html:56
+#: mailServer/templates/mailServer/index.html:37
#: mailServer/templates/mailServer/index.html:39
msgid "Delete Email"
msgstr "メールアカウントの削除"
#: baseTemplate/templates/baseTemplate/index.html:523
-#: databases/templates/databases/listDataBases.html:72
+#: databases/templates/databases/listDataBases.html:73
#: ftp/templates/ftp/listFTPAccounts.html:73
#: mailServer/templates/mailServer/changeEmailPassword.html:64
+#: mailServer/templates/mailServer/index.html:49
#: mailServer/templates/mailServer/index.html:51
msgid "Change Password"
msgstr "パスワードの変更"
@@ -661,33 +909,35 @@ msgstr "Webメール アクセス"
#: baseTemplate/templates/baseTemplate/index.html:543
#: ftp/templates/ftp/createFTPAccount.html:12
-#: ftp/templates/ftp/createFTPAccount.html:19 ftp/templates/ftp/index.html:27
-#: websiteFunctions/templates/websiteFunctions/website.html:461
+#: 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
msgid "Create FTP Account"
msgstr "FTP アカウントの作成"
#: baseTemplate/templates/baseTemplate/index.html:544
#: ftp/templates/ftp/deleteFTPAccount.html:12
#: ftp/templates/ftp/deleteFTPAccount.html:18
-#: ftp/templates/ftp/deleteFTPAccount.html:52 ftp/templates/ftp/index.html:39
-#: websiteFunctions/templates/websiteFunctions/website.html:473
+#: 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
msgid "Delete FTP Account"
msgstr "FTP アカウントの削除"
#: baseTemplate/templates/baseTemplate/index.html:545
-#: ftp/templates/ftp/index.html:51 ftp/templates/ftp/listFTPAccounts.html:13
+#: ftp/templates/ftp/index.html:49 ftp/templates/ftp/index.html:51
+#: ftp/templates/ftp/listFTPAccounts.html:13
#: ftp/templates/ftp/listFTPAccounts.html:19
msgid "List FTP Accounts"
msgstr "FTP アカウントの一覧"
-#: baseTemplate/templates/baseTemplate/index.html:562
-msgid "Restore Back up"
-msgstr "バックアップの復元"
-
#: baseTemplate/templates/baseTemplate/index.html:563
msgid "Add/Delete Destination"
msgstr "バックアップ先の追加/削除"
+#: baseTemplate/templates/baseTemplate/index.html:573
#: baseTemplate/templates/baseTemplate/index.html:574
msgid "SSL"
msgstr "SSL"
@@ -713,34 +963,43 @@ msgid "NEW"
msgstr "新規"
#: baseTemplate/templates/baseTemplate/index.html:598
-#: tuning/templates/tuning/index.html:26
+#: 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
-#: tuning/templates/tuning/index.html:38
+#: 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
+#: serverStatus/templates/serverStatus/index.html:25
#: serverStatus/templates/serverStatus/index.html:27
msgid "LiteSpeed Status"
msgstr "LiteSpeed の状態"
#: baseTemplate/templates/baseTemplate/index.html:615
#: serverStatus/templates/serverStatus/cybercpmainlogfile.html:15
+#: serverStatus/templates/serverStatus/index.html:37
#: serverStatus/templates/serverStatus/index.html:39
msgid "CyberPanel Main Log File"
msgstr "CyberPanel メインログファイル"
#: baseTemplate/templates/baseTemplate/index.html:632
+#: managePHP/templates/managePHP/installExtensions.html:13
+msgid "Install PHP Extensions"
+msgstr "PHP拡張機能のインストール"
+
+#: baseTemplate/templates/baseTemplate/index.html:632
+#: managePHP/templates/managePHP/index.html:24
#: managePHP/templates/managePHP/index.html:26
msgid "Install Extensions"
msgstr "拡張機能のインストール"
#: baseTemplate/templates/baseTemplate/index.html:633
+#: managePHP/templates/managePHP/index.html:36
#: managePHP/templates/managePHP/index.html:38
msgid "Edit PHP Configs"
msgstr "PHP 設定の編集"
@@ -751,27 +1010,42 @@ msgstr "アクセスログ"
#: baseTemplate/templates/baseTemplate/index.html:649
#: serverLogs/templates/serverLogs/errorLogs.html:14
+#: serverLogs/templates/serverLogs/index.html:37
#: serverLogs/templates/serverLogs/index.html:39
#: websiteFunctions/templates/websiteFunctions/website.html:133
msgid "Error Logs"
msgstr "エラーログ"
+#: baseTemplate/templates/baseTemplate/index.html:650
+#: 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
msgid "Email Log"
msgstr "メールログ"
#: baseTemplate/templates/baseTemplate/index.html:651
#: 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
+msgid "Firewall Home"
+msgstr "ファイアウォールホーム"
+
+#: baseTemplate/templates/baseTemplate/index.html:666
+#: firewall/templates/firewall/index.html:25
#: firewall/templates/firewall/index.html:27
msgid "Firewall"
msgstr "ファイアウォール"
#: baseTemplate/templates/baseTemplate/index.html:667
+#: firewall/templates/firewall/index.html:36
#: firewall/templates/firewall/index.html:38
#: firewall/templates/firewall/secureSSH.html:13
#: firewall/templates/firewall/secureSSH.html:20
@@ -838,7 +1112,7 @@ msgid "Create a new database on this page."
msgstr "このページで新しいデータベースを作成します。"
#: databases/templates/databases/createDatabase.html:42
-#: databases/templates/databases/listDataBases.html:87
+#: databases/templates/databases/listDataBases.html:88
msgid "Database Name"
msgstr "データベース名"
@@ -878,10 +1152,6 @@ msgstr "データベースが削除されました。"
msgid "Database Functions - CyberPanel"
msgstr "データベース機能 - CyberPanel"
-#: databases/templates/databases/index.html:12
-msgid "Database Functions"
-msgstr "データベース機能"
-
#: databases/templates/databases/index.html:13
msgid "Create, edit and delete databases on this page."
msgstr "このページでデータベースの作成、編集、削除を行います。"
@@ -907,21 +1177,27 @@ msgstr "ドメインタイプの選択"
msgid "Records successfully fetched for"
msgstr "レコードが取得されました"
-#: databases/templates/databases/listDataBases.html:53
+#: databases/templates/databases/listDataBases.html:50
+#, fuzzy
+#| msgid "Password changed for"
+msgid "Password changed for: "
+msgstr "パスワードが変更されました"
+
+#: databases/templates/databases/listDataBases.html:54
msgid "Cannot change password for "
msgstr "パスワードを変更できません "
-#: databases/templates/databases/listDataBases.html:58
+#: databases/templates/databases/listDataBases.html:59
#: firewall/templates/firewall/firewall.html:166
#: ftp/templates/ftp/listFTPAccounts.html:59
msgid "Could Not Connect to server. Please refresh this page"
msgstr "サーバーに接続できませんでした。 このページを更新してください"
-#: databases/templates/databases/listDataBases.html:88
+#: databases/templates/databases/listDataBases.html:89
msgid "Database User"
msgstr "データベースのユーザー"
-#: databases/templates/databases/listDataBases.html:97
+#: databases/templates/databases/listDataBases.html:98
#: ftp/templates/ftp/listFTPAccounts.html:100
msgid "Change"
msgstr "変更"
@@ -946,6 +1222,38 @@ msgstr ""
msgid "Add Records"
msgstr "レコードを追加"
+#: dns/templates/dns/addDeleteDNSRecords.html:53
+#: dns/templates/dns/addDeleteDNSRecords.html:131
+#: firewall/templates/firewall/firewall.html:128
+#: serverStatus/templates/serverStatus/litespeedStatus.html:40
+msgid "Name"
+msgstr "名称"
+
+#: dns/templates/dns/addDeleteDNSRecords.html:69
+msgid "IPV6"
+msgstr "IPv6"
+
+#: dns/templates/dns/addDeleteDNSRecords.html:78
+#: dns/templates/dns/addDeleteDNSRecords.html:133
+msgid "Priority"
+msgstr "優先度"
+
+#: dns/templates/dns/addDeleteDNSRecords.html:87
+#: dns/templates/dns/createDNSZone.html:27
+#: dns/templates/dns/createNameServer.html:27
+#: websiteFunctions/templates/websiteFunctions/createWebsite.html:52
+#: websiteFunctions/templates/websiteFunctions/website.html:263
+msgid "Domain Name"
+msgstr "ドメイン名"
+
+#: dns/templates/dns/addDeleteDNSRecords.html:95
+msgid "Policy"
+msgstr "ポリシ"
+
+#: dns/templates/dns/addDeleteDNSRecords.html:103
+msgid "Text"
+msgstr "テキスト"
+
#: dns/templates/dns/addDeleteDNSRecords.html:111
#: firewall/templates/firewall/firewall.html:109
msgid "Add"
@@ -955,20 +1263,10 @@ msgstr "追加"
msgid "Type"
msgstr "種別"
-#: dns/templates/dns/addDeleteDNSRecords.html:131
-#: firewall/templates/firewall/firewall.html:128
-#: serverStatus/templates/serverStatus/litespeedStatus.html:40
-msgid "Name"
-msgstr "名前"
-
#: dns/templates/dns/addDeleteDNSRecords.html:132
msgid "Value"
msgstr "値"
-#: dns/templates/dns/addDeleteDNSRecords.html:133
-msgid "Priority"
-msgstr "優先順位"
-
#: dns/templates/dns/addDeleteDNSRecords.html:160
msgid "Cannot fetch records. Error message:"
msgstr "レコードを取得できません。エラー メッセージ:"
@@ -1007,12 +1305,6 @@ msgstr ""
msgid "Details"
msgstr "詳細"
-#: dns/templates/dns/createDNSZone.html:27
-#: dns/templates/dns/createNameServer.html:27
-#: websiteFunctions/templates/websiteFunctions/createWebsite.html:52
-msgid "Domain Name"
-msgstr "ドメイン名"
-
#: dns/templates/dns/createDNSZone.html:51
msgid "Cannot create DNS Zone. Error message:"
msgstr "DNS ゾーンを作成できません。エラーメッセージ:"
@@ -1103,6 +1395,10 @@ msgstr "DNS 機能"
msgid "Create, edit and delete DNS zones on this page."
msgstr "このページでDNSゾーンを作成、編集、削除を行います。"
+#: dns/templates/dns/index.html:53 dns/templates/dns/index.html:108
+msgid "Add Delete Records"
+msgstr "削除レコードを追加"
+
#: dns/templates/dns/index.html:55 dns/templates/dns/index.html:110
msgid "Add Delete/Records"
msgstr "削除/レコードを追加"
@@ -1174,12 +1470,13 @@ msgstr "このページでサーバーセキュリティを管理します。"
#: firewall/templates/firewall/secureSSH.html:3
msgid "Secure SSH - CyberPanel"
-msgstr "SSH のセキュリティ - CyberPanel"
+msgstr "SSH のセキュリティ - CyberPanel"
#: firewall/templates/firewall/secureSSH.html:14
-#: managePHP/templates/managePHP/editPHPConfig.html:15
-msgid "Edit PHP Configurations on this page."
-msgstr "このページで PHP 設定を編集してください。"
+#, fuzzy
+#| msgid "SSH Configurations Saved."
+msgid "Secure or harden SSH Configurations."
+msgstr "SSH の設定が保存されました。"
#: firewall/templates/firewall/secureSSH.html:28
#: managePHP/templates/managePHP/editPHPConfig.html:29
@@ -1226,8 +1523,8 @@ msgstr "キーを追加"
#: firewall/templates/firewall/secureSSH.html:158
#: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:55
-#: websiteFunctions/templates/websiteFunctions/website.html:303
-#: websiteFunctions/templates/websiteFunctions/website.html:363
+#: websiteFunctions/templates/websiteFunctions/website.html:527
+#: websiteFunctions/templates/websiteFunctions/website.html:587
msgid "Save"
msgstr "保存"
@@ -1255,6 +1552,10 @@ msgstr "FTP のパスワード"
msgid "Path (Relative)"
msgstr "パス (相対値)"
+#: ftp/templates/ftp/createFTPAccount.html:61
+msgid "Leave empty to select default home directory."
+msgstr "デフォルトのホームディレクトリを選択するには、空のままにします。"
+
#: ftp/templates/ftp/createFTPAccount.html:72
msgid "Create FTP"
msgstr "FTPアカウント の作成"
@@ -1304,10 +1605,6 @@ msgstr "サーバーに接続できませんでした。 このページを更
msgid "FTP Functions - CyberPanel"
msgstr "FTP 機能 - CyberPanel"
-#: ftp/templates/ftp/index.html:12
-msgid "FTP Functions"
-msgstr "FTP 機能"
-
#: ftp/templates/ftp/index.html:13
msgid "Delete and create FTP accounts on this page."
msgstr "このページで FTP アカウントを削除して作成します。"
@@ -1371,11 +1668,6 @@ msgstr "現在、このドメインにはメールアカウントはありませ
msgid "Create Email Account - CyberPanel"
msgstr "メールアカウントの作成 - CyberPanel"
-#: mailServer/templates/mailServer/createEmailAccount.html:12
-#: mailServer/templates/mailServer/createEmailAccount.html:19
-msgid "Create Email Account"
-msgstr "メールアカウントの作成"
-
#: mailServer/templates/mailServer/createEmailAccount.html:13
msgid "Select a website from the list, to create an email account."
msgstr ""
@@ -1397,11 +1689,6 @@ msgstr " 作成されました。"
msgid "Delete Email Account - CyberPanel"
msgstr "メールアカウントの削除 - CyberPanel"
-#: mailServer/templates/mailServer/deleteEmailAccount.html:12
-#: mailServer/templates/mailServer/deleteEmailAccount.html:19
-msgid "Delete Email Account"
-msgstr "メールアカウントの削除"
-
#: mailServer/templates/mailServer/deleteEmailAccount.html:13
msgid "Select a website from the list, to delete an email account."
msgstr ""
@@ -1432,6 +1719,10 @@ msgstr "PHP 設定の編集 - CyberPanel"
msgid "Edit PHP Configurations"
msgstr "PHP 設定の編集"
+#: managePHP/templates/managePHP/editPHPConfig.html:15
+msgid "Edit PHP Configurations on this page."
+msgstr "このページで PHP 設定を編集してください。"
+
#: managePHP/templates/managePHP/editPHPConfig.html:35
msgid "Advanced"
msgstr "高度"
@@ -1442,6 +1733,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
msgid "Select PHP"
msgstr "PHP の選択"
@@ -1498,10 +1790,6 @@ msgstr "必要に応じて PHP 設定を編集します。"
msgid "Install PHP Extensions - CyberPanel"
msgstr "PHP 拡張機能のインストール - CyberPanel"
-#: managePHP/templates/managePHP/installExtensions.html:13
-msgid "Install PHP Extensions"
-msgstr "PHP拡張機能のインストール"
-
#: managePHP/templates/managePHP/installExtensions.html:14
msgid "Install/uninstall php extensions on this page."
msgstr "このページでPHP拡張機能をインストール/アンインストールします。"
@@ -1511,6 +1799,10 @@ msgstr "このページでPHP拡張機能をインストール/アンインス
msgid "Select PHP Version"
msgstr "PHP バージョンを選択"
+#: managePHP/templates/managePHP/installExtensions.html:48
+msgid "Search Extensions.."
+msgstr "拡張機能を検索.."
+
#: managePHP/templates/managePHP/installExtensions.html:63
msgid "Extension Name"
msgstr "拡張機能名"
@@ -1626,38 +1918,47 @@ msgid "Package Name"
msgstr "パッケージ名"
#: packages/templates/packages/createPackage.html:35
-#: packages/templates/packages/modifyPackage.html:39
+#: packages/templates/packages/modifyPackage.html:40
+#: websiteFunctions/templates/websiteFunctions/website.html:223
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Domains"
+msgstr "ドメイン名"
+
+#: packages/templates/packages/createPackage.html:39
+#: packages/templates/packages/modifyPackage.html:44
+#, fuzzy
+#| msgid "( 0 = Unlimited )"
+msgid "(0 = Unlimited)"
+msgstr "( 0 = 無制限 )"
+
+#: packages/templates/packages/createPackage.html:43
+#: packages/templates/packages/modifyPackage.html:49
msgid "Disk Space"
msgstr "ディスクスの容量"
-#: packages/templates/packages/createPackage.html:39
#: packages/templates/packages/createPackage.html:47
-#: packages/templates/packages/modifyPackage.html:43
-#: packages/templates/packages/modifyPackage.html:51
+#: packages/templates/packages/createPackage.html:55
+#: packages/templates/packages/modifyPackage.html:53
+#: packages/templates/packages/modifyPackage.html:61
msgid "MB (0 = Unlimited)"
msgstr "MB (0 = 無制限)"
-#: packages/templates/packages/createPackage.html:43
-#: packages/templates/packages/modifyPackage.html:47
+#: packages/templates/packages/createPackage.html:51
+#: packages/templates/packages/modifyPackage.html:57
msgid "Bandwidth"
msgstr "帯域幅"
-#: packages/templates/packages/createPackage.html:52
-#: packages/templates/packages/modifyPackage.html:56
+#: packages/templates/packages/createPackage.html:60
+#: packages/templates/packages/modifyPackage.html:66
msgid "FTP Accounts"
msgstr "FTP アカウント"
-#: packages/templates/packages/createPackage.html:87
+#: packages/templates/packages/createPackage.html:95
msgid "Cannot create package. Error message:"
msgstr "パッケージを作成できません。エラーメッセージ:"
-#: packages/templates/packages/createPackage.html:91
-#: packages/templates/packages/deletePackage.html:63
-#: packages/templates/packages/modifyPackage.html:102
-msgid "Package"
-msgstr "パッケージ"
-
-#: packages/templates/packages/createPackage.html:91
+#: packages/templates/packages/createPackage.html:99
msgid "Successfully Created"
msgstr "作成されました"
@@ -1689,15 +1990,15 @@ msgstr "パッケージ - CyberPanel"
msgid "Modify Package - CyberPanel"
msgstr "パッケージの変更 - CyberPanel"
-#: packages/templates/packages/modifyPackage.html:94
+#: packages/templates/packages/modifyPackage.html:104
msgid "Cannot fetch package details. Error message:"
msgstr "パッケージの詳細を取得できません。エラー メッセージ:"
-#: packages/templates/packages/modifyPackage.html:98
+#: packages/templates/packages/modifyPackage.html:108
msgid "Package Details Successfully Fetched"
msgstr "パッケージの詳細が取得されました"
-#: packages/templates/packages/modifyPackage.html:102
+#: packages/templates/packages/modifyPackage.html:112
msgid "Successfully Modified"
msgstr "更新されました"
@@ -1706,6 +2007,7 @@ msgid "Access Logs - CyberPanel"
msgstr "アクセスログ - CyberPanel"
#: serverLogs/templates/serverLogs/accessLogs.html:17
+#: serverLogs/templates/serverLogs/index.html:25
#: serverLogs/templates/serverLogs/index.html:27
#: websiteFunctions/templates/websiteFunctions/website.html:121
msgid "Access Logs"
@@ -1754,11 +2056,6 @@ msgstr ""
msgid "Error Logs - CyberPanel"
msgstr "エラーログ - CyberPanel"
-#: serverLogs/templates/serverLogs/emailLogs.html:14
-#: serverLogs/templates/serverLogs/index.html:51
-msgid "Email Logs"
-msgstr "メールログ"
-
#: serverLogs/templates/serverLogs/emailLogs.html:15
msgid "Email Logs for main web server."
msgstr "メイン Web サーバーのメールログ。"
@@ -1853,7 +2150,7 @@ msgstr ""
"生しました。CyberPanelメインログファイルを参照してください。"
#: serverStatus/templates/serverStatus/litespeedStatus.html:72
-msgid "Reboot LiteSpeed"
+msgid "Reboot Litespeed"
msgstr "LiteSpeed を再起動"
#: serverStatus/templates/serverStatus/litespeedStatus.html:77
@@ -2095,6 +2392,7 @@ msgid "Must contain one number and one special character."
msgstr "1 つの数字と 1 つの特殊文字を含める必要があります。"
#: userManagment/templates/userManagment/createUser.html:143
+#: userManagment/templates/userManagment/index.html:40
#: userManagment/templates/userManagment/index.html:42
msgid "Create User"
msgstr "ユーザーを作成"
@@ -2138,10 +2436,6 @@ msgstr "ユーザー "
msgid "User Functions - CyberPanel"
msgstr "ユーザ機能 - CyberPanel"
-#: userManagment/templates/userManagment/index.html:13
-msgid "User Functions"
-msgstr "ユーザ機能"
-
#: userManagment/templates/userManagment/index.html:14
msgid "Create, edit and delete users on this page."
msgstr "このページでユーザーを作成、編集、削除を行います。"
@@ -2221,15 +2515,19 @@ msgid "Select Owner"
msgstr "所有者を選択"
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:56
+#: websiteFunctions/templates/websiteFunctions/website.html:267
+#: websiteFunctions/templates/websiteFunctions/website.html:278
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
msgid "Additional Features"
msgstr "その他の機能"
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:91
+#: websiteFunctions/templates/websiteFunctions/website.html:306
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."
@@ -2238,14 +2536,17 @@ msgstr ""
"署名された SSL が発行されます。後で独自の SSL を追加できます。"
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:113
+#: websiteFunctions/templates/websiteFunctions/website.html:328
msgid "Cannot create website. Error message:"
msgstr "Web サイトを作成できません。エラーメッセージ："
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:117
+#: websiteFunctions/templates/websiteFunctions/website.html:332
msgid "Website with domain"
msgstr "ドメインを持つ Web サイト"
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:117
+#: websiteFunctions/templates/websiteFunctions/website.html:332
msgid " is Successfully Created"
msgstr " 作成されました"
@@ -2265,10 +2566,6 @@ msgstr ""
msgid "Cannot delete website, Error message: "
msgstr "Web サイトを削除できません、エラーメッセージ: "
-#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:65
-msgid "Website"
-msgstr "Web サイト"
-
#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:65
msgid "Successfully Deleted."
msgstr "削除されました。"
@@ -2277,10 +2574,7 @@ msgstr "削除されました。"
msgid "Website Functions - CyberPanel"
msgstr "Web サイト機能 - CyberPanel"
-#: websiteFunctions/templates/websiteFunctions/index.html:13
-msgid "Website Functions"
-msgstr "Web サイト機能"
-
+#: websiteFunctions/templates/websiteFunctions/index.html:70
#: websiteFunctions/templates/websiteFunctions/index.html:72
#: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:13
#: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:20
@@ -2372,6 +2666,14 @@ msgstr "許可"
msgid "Bandwidth Usage"
msgstr "帯域幅の使用量"
+#: websiteFunctions/templates/websiteFunctions/website.html:119
+msgid "Load Access Logs"
+msgstr "アクセス ログを読み込む"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:131
+msgid "Load Error Logs"
+msgstr "エラー ログを読み込む"
+
#: websiteFunctions/templates/websiteFunctions/website.html:147
msgid "Logs Fetched"
msgstr "ログが取得されました"
@@ -2391,84 +2693,162 @@ msgstr "次へ"
msgid "Previous"
msgstr "前へ"
-#: websiteFunctions/templates/websiteFunctions/website.html:227
-msgid "Configurations"
-msgstr "設定"
+#: websiteFunctions/templates/websiteFunctions/website.html:230
+#: websiteFunctions/templates/websiteFunctions/website.html:232
+#, fuzzy
+#| msgid "Add Destination"
+msgid "Add Domains"
+msgstr "バックアップ先の追加"
-#: websiteFunctions/templates/websiteFunctions/website.html:235
-msgid "Edit vHost Main Configurations"
-msgstr "メイン vHost 設定の編集"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:247
-msgid "Add Rewrite Rules (.htaccess)"
-msgstr "Rewrite ルールを追加 (.htaccess)"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:259
-msgid "Add SSL"
-msgstr "SSL を追加"
+#: websiteFunctions/templates/websiteFunctions/website.html:242
+#: websiteFunctions/templates/websiteFunctions/website.html:244
+#, fuzzy
+#| msgid "Select Domain"
+msgid "List Domains"
+msgstr "ドメインタイプの選択"
#: websiteFunctions/templates/websiteFunctions/website.html:274
-msgid "SSL Saved"
-msgstr "SSL を保存しました"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:279
-msgid "Could not save SSL. Error message:"
-msgstr "SSL を保存できませんでした。エラー メッセージ:"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:329
-msgid "Current configuration in the file fetched."
-msgstr "取得されたファイル内にある現在の設定。"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:334
-#: websiteFunctions/templates/websiteFunctions/website.html:347
-msgid "Could not fetch current configuration. Error message:"
-msgstr "現在の設定を取得できませんでした。エラー メッセージ:"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:343
-#: websiteFunctions/templates/websiteFunctions/website.html:398
-msgid "Configuration saved. Restart LiteSpeed put them in effect."
-msgstr "設定が保存されました。 LiteSpeed を再起動して有効にします。"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:384
-msgid "Current rewrite rules in the file fetched."
-msgstr "取得されたファイル内にある現在の rewrite ルール。"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:389
-msgid "Could not fetch current rewrite rules. Error message:"
-msgstr "現在の rewrite ルールを取得できませんでした。エラー メッセージ:"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:402
-msgid "Could not save rewrite rules. Error message:"
-msgstr "rewrite ルールを保存できませんでした。エラー メッセージ:"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:418
-msgid "Save Rewrite Rules"
-msgstr "Rewrite ルールを保存"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:441
-msgid "Files"
-msgstr "ファイル"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:450
-msgid "File Manager"
-msgstr "ファイル 管理"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:490
-msgid "Application Installer"
-msgstr "アプリケーションインストーラー"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:498
-msgid "Wordpress with LSCache"
-msgstr "Wordpress の LSCache"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:510
+#: websiteFunctions/templates/websiteFunctions/website.html:733
msgid "Path"
msgstr "パス"
-#: websiteFunctions/templates/websiteFunctions/website.html:532
+#: websiteFunctions/templates/websiteFunctions/website.html:276
+msgid "This path is relative to: "
+msgstr ""
+
+#: websiteFunctions/templates/websiteFunctions/website.html:276
+#, fuzzy
+#| msgid "Leave empty to select default home directory."
+msgid "Leave empty to set default."
+msgstr "デフォルトのホームディレクトリを選択するには、空のままにします。"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:317
+#, fuzzy
+#| msgid "Create Email"
+msgid "Create Domain"
+msgstr "メールアカウントの作成"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:360
+#, fuzzy
+#| msgid "Version Management"
+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が発行されました"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:391
+msgid "Close"
+msgstr ""
+
+#: websiteFunctions/templates/websiteFunctions/website.html:423
+#, fuzzy
+#| msgid "Issue SSL"
+msgid "Issue"
+msgstr "SSLを発行する"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:451
+msgid "Configurations"
+msgstr "設定"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:457
+msgid "Edit Virtual Host Main Configurations"
+msgstr "仮想ホストのメイン設定の編集"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:459
+msgid "Edit vHost Main Configurations"
+msgstr "メイン vHost 設定の編集"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:469
+#: websiteFunctions/templates/websiteFunctions/website.html:471
+msgid "Add Rewrite Rules (.htaccess)"
+msgstr "Rewrite ルールを追加 (.htaccess)"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:481
+msgid "Add Your Own SSL"
+msgstr "独自のSSLを追加"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:483
+msgid "Add SSL"
+msgstr "SSL を追加"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:498
+msgid "SSL Saved"
+msgstr "SSL を保存しました"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:503
+msgid "Could not save SSL. Error message:"
+msgstr "SSL を保存できませんでした。エラー メッセージ:"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:553
+msgid "Current configuration in the file fetched."
+msgstr "取得されたファイル内にある現在の設定。"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:558
+#: websiteFunctions/templates/websiteFunctions/website.html:571
+msgid "Could not fetch current configuration. Error message:"
+msgstr "現在の設定を取得できませんでした。エラー メッセージ:"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:567
+#: websiteFunctions/templates/websiteFunctions/website.html:622
+msgid "Configuration saved. Restart LiteSpeed put them in effect."
+msgstr "設定が保存されました。 LiteSpeed を再起動して有効にします。"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:608
+msgid "Current rewrite rules in the file fetched."
+msgstr "取得されたファイル内にある現在の rewrite ルール。"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:613
+msgid "Could not fetch current rewrite rules. Error message:"
+msgstr "現在の rewrite ルールを取得できませんでした。エラー メッセージ:"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:626
+msgid "Could not save rewrite rules. Error message:"
+msgstr "rewrite ルールを保存できませんでした。エラー メッセージ:"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:642
+msgid "Save Rewrite Rules"
+msgstr "Rewrite ルールを保存"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:665
+msgid "Files"
+msgstr "ファイル"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:672
+#: websiteFunctions/templates/websiteFunctions/website.html:674
+msgid "File Manager"
+msgstr "ファイル 管理"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:713
+msgid "Application Installer"
+msgstr "アプリケーションインストーラー"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:719
+#, fuzzy
+#| msgid "Wordpress with LSCache"
+msgid "Install wordpress with LSCache"
+msgstr "Wordpress の LSCache"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:721
+msgid "Wordpress with LSCache"
+msgstr "Wordpress の LSCache"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:755
msgid "Installation failed. Error message:"
msgstr "インストールに失敗しました。エラー メッセージ:"
-#: websiteFunctions/templates/websiteFunctions/website.html:536
+#: websiteFunctions/templates/websiteFunctions/website.html:759
msgid "Installation successful. To complete the setup visit:"
msgstr "インストールに成功しました。 セットアップを完了するには:"
+
+#~ msgid "Urdu"
+#~ msgstr "ウルドゥー語"
diff --git a/locale/pt/LC_MESSAGES/django.mo b/locale/pt/LC_MESSAGES/django.mo
index 437612fda..9cb54d220 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 ea6131dd1..d6c760462 100644
--- a/locale/pt/LC_MESSAGES/django.po
+++ b/locale/pt/LC_MESSAGES/django.po
@@ -3,11 +3,19 @@
# This file is distributed under the same license as the CyberPanel package.
# FIRST AUTHOR , 2017.
#
+#: baseTemplate/templates/baseTemplate/index.html:211
+#: baseTemplate/templates/baseTemplate/index.html:301
+#: baseTemplate/templates/baseTemplate/index.html:356
+#: baseTemplate/templates/baseTemplate/index.html:362
+#: baseTemplate/templates/baseTemplate/index.html:368
+#: baseTemplate/templates/baseTemplate/index.html:374
+#: baseTemplate/templates/baseTemplate/index.html:380
+#: baseTemplate/templates/baseTemplate/index.html:386
msgid ""
msgstr ""
"Project-Id-Version: CyberPanel\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-21 14:46+0500\n"
+"POT-Creation-Date: 2017-10-29 20:47+0500\n"
"PO-Revision-Date: 2017-10-21 00:03+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE \n"
@@ -22,21 +30,25 @@ msgid "English"
msgstr "Inglês"
#: CyberCP/settings.py:168
-msgid "Urdu"
-msgstr ""
-
-#: CyberCP/settings.py:169
msgid "Chinese"
msgstr "Chinês"
-#: CyberCP/settings.py:170
+#: CyberCP/settings.py:169
msgid "Bulgarian"
msgstr ""
-#: CyberCP/settings.py:172
+#: CyberCP/settings.py:170
msgid "Portuguese"
msgstr ""
+#: CyberCP/settings.py:171
+msgid "Japanese"
+msgstr ""
+
+#: CyberCP/settings.py:172
+msgid "Bosnian"
+msgstr ""
+
#: backup/templates/backup/backup.html:3 backup/templates/backup/backup.html:13
#: backup/templates/backup/backup.html:20
msgid "Back up Website"
@@ -67,7 +79,7 @@ msgid "Destination"
msgstr "Destino"
#: backup/templates/backup/backup.html:43
-#: baseTemplate/templates/baseTemplate/homePage.html:13
+#: baseTemplate/templates/baseTemplate/homePage.html:12
msgid "Home"
msgstr "Principal"
@@ -77,7 +89,7 @@ msgid "File Name"
msgstr "Nome do Ficheiro"
#: backup/templates/backup/backup.html:60
-#: backup/templates/backup/backup.html:99
+#: backup/templates/backup/backup.html:105
#: backup/templates/backup/restore.html:63
#: baseTemplate/templates/baseTemplate/index.html:390
#: firewall/templates/firewall/firewall.html:36
@@ -94,10 +106,16 @@ msgstr "A correr"
msgid "Create Back up"
msgstr "Criar Backup"
-#: backup/templates/backup/backup.html:95
+#: backup/templates/backup/backup.html:87
+#, fuzzy
+#| msgid "Create Back up"
+msgid "Cancel Backup"
+msgstr "Criar Backup"
+
+#: backup/templates/backup/backup.html:101
#: backup/templates/backup/backupDestinations.html:90
#: backup/templates/backup/backupSchedule.html:89
-#: databases/templates/databases/listDataBases.html:86
+#: databases/templates/databases/listDataBases.html:87
#: dns/templates/dns/addDeleteDNSRecords.html:129
#: firewall/templates/firewall/firewall.html:127
#: ftp/templates/ftp/listFTPAccounts.html:87
@@ -105,33 +123,34 @@ msgstr "Criar Backup"
msgid "ID"
msgstr "ID"
-#: backup/templates/backup/backup.html:96
+#: backup/templates/backup/backup.html:102
msgid "File"
msgstr "Ficheiro"
-#: backup/templates/backup/backup.html:97
+#: backup/templates/backup/backup.html:103
msgid "Date"
msgstr "Data"
-#: backup/templates/backup/backup.html:98
+#: backup/templates/backup/backup.html:104
#: ftp/templates/ftp/listFTPAccounts.html:90
msgid "Size"
msgstr "Tamanho"
-#: backup/templates/backup/backup.html:100
+#: backup/templates/backup/backup.html:106
#: 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/secureSSH.html:122
+#: websiteFunctions/templates/websiteFunctions/website.html:424
msgid "Delete"
msgstr "Apagar"
-#: backup/templates/backup/backup.html:124
+#: backup/templates/backup/backup.html:130
msgid "Cannot delete website, Error message: "
msgstr "Impossível apagar website, Mensagem de erro: "
-#: backup/templates/backup/backup.html:128
+#: backup/templates/backup/backup.html:134
msgid "Successfully Deleted"
msgstr "Apagado com Sucesso"
@@ -146,14 +165,17 @@ msgid "On this page you can set up your Back up destinations. (SFTP)"
msgstr "Nesta página, pode definir os seus destinos de backups. (SFTP)"
#: backup/templates/backup/backupDestinations.html:30
+#: backup/templates/backup/remoteBackups.html:29
+#: dns/templates/dns/addDeleteDNSRecords.html:60
#: dns/templates/dns/createNameServer.html:48
#: dns/templates/dns/createNameServer.html:65
msgid "IP Address"
msgstr "Endereço de IP"
#: backup/templates/backup/backupDestinations.html:38
+#: backup/templates/backup/remoteBackups.html:37
#: databases/templates/databases/createDatabase.html:58
-#: databases/templates/databases/listDataBases.html:89
+#: databases/templates/databases/listDataBases.html:90
#: ftp/templates/ftp/listFTPAccounts.html:91
#: mailServer/templates/mailServer/changeEmailPassword.html:52
#: mailServer/templates/mailServer/createEmailAccount.html:51
@@ -164,6 +186,7 @@ msgstr "Palavra-Chave"
#: backup/templates/backup/backupDestinations.html:48
#: backup/templates/backup/backupSchedule.html:54
+#: baseTemplate/templates/baseTemplate/index.html:563
msgid "Add Destination"
msgstr "Adicionar Destino"
@@ -205,10 +228,12 @@ msgstr "Destino Adicionado."
#: userManagment/templates/userManagment/modifyUser.html:139
#: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:77
#: websiteFunctions/templates/websiteFunctions/website.html:157
-#: websiteFunctions/templates/websiteFunctions/website.html:284
-#: websiteFunctions/templates/websiteFunctions/website.html:339
-#: websiteFunctions/templates/websiteFunctions/website.html:394
-#: websiteFunctions/templates/websiteFunctions/website.html:542
+#: 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
msgid "Could not connect to server. Please refresh this page."
msgstr "Impossível conectar ao servidor. Por favor atualize esta página."
@@ -273,8 +298,11 @@ 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:270
+#: baseTemplate/templates/baseTemplate/homePage.html:266
+#: baseTemplate/templates/baseTemplate/homePage.html:269
+#: baseTemplate/templates/baseTemplate/index.html:554
#: baseTemplate/templates/baseTemplate/index.html:556
+#: baseTemplate/templates/baseTemplate/index.html:572
msgid "Back up"
msgstr "Backup"
@@ -283,7 +311,7 @@ msgid "Back up and restore sites."
msgstr "Faça backup e restaure sites."
#: backup/templates/backup/index.html:19
-#: baseTemplate/templates/baseTemplate/homePage.html:165
+#: baseTemplate/templates/baseTemplate/homePage.html:164
#: databases/templates/databases/index.html:19 dns/templates/dns/index.html:19
#: firewall/templates/firewall/index.html:19 ftp/templates/ftp/index.html:19
#: mailServer/templates/mailServer/index.html:19
@@ -298,11 +326,115 @@ msgstr "Faça backup e restaure sites."
msgid "Available Functions"
msgstr "Funções Disponíveis"
+#: backup/templates/backup/index.html:27 backup/templates/backup/index.html:43
+#, fuzzy
+#| msgid "Back up Website"
+msgid "Back up Site"
+msgstr "Efetuar backup do Website"
+
+#: backup/templates/backup/index.html:55
+#: baseTemplate/templates/baseTemplate/index.html:562
+msgid "Restore Back up"
+msgstr "Restaurar Backup"
+
#: backup/templates/backup/index.html:57
#: backup/templates/backup/restore.html:45
msgid "Restore"
msgstr "Restaurar"
+#: backup/templates/backup/remoteBackups.html:3
+#, fuzzy
+#| msgid "Websites Hosted - CyberPanel"
+msgid "Transfer Websites from Remote Server - CyberPanel"
+msgstr "Websites Alojados - CyberPanel"
+
+#: backup/templates/backup/remoteBackups.html:14
+#: backup/templates/backup/remoteBackups.html:21
+#, fuzzy
+#| msgid "Restore Back up"
+msgid "Remote Backups"
+msgstr "Restaurar Backup"
+
+#: backup/templates/backup/remoteBackups.html:15
+msgid "This feature can import website(s) from remote server"
+msgstr ""
+
+#: backup/templates/backup/remoteBackups.html:46
+#, fuzzy
+#| msgid "FTP Accounts"
+msgid "Fetch Accounts"
+msgstr "Contas de FTP"
+
+#: backup/templates/backup/remoteBackups.html:55
+msgid "Start Transfer"
+msgstr ""
+
+#: backup/templates/backup/remoteBackups.html:59
+#: websiteFunctions/templates/websiteFunctions/website.html:269
+msgid "Cancel"
+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 "Não foi possível efetuar a ligação. Por favor atualize esta página."
+
+#: backup/templates/backup/remoteBackups.html:76
+#, fuzzy
+#| msgid "Records successfully fetched for"
+msgid "Accounts Successfully Fetched from remote server."
+msgstr "Registos obtidos com sucesso para"
+
+#: backup/templates/backup/remoteBackups.html:80
+#, fuzzy
+#| msgid " is successfully created."
+msgid "Backup Process successfully started."
+msgstr " foi criado com sucesso."
+
+#: backup/templates/backup/remoteBackups.html:84
+#, fuzzy
+#| msgid "is successfully created."
+msgid "Backup successfully cancelled."
+msgstr "foi criado com sucesso."
+
+#: backup/templates/backup/remoteBackups.html:96
+#, fuzzy
+#| msgid "Select Account"
+msgid "Search Accounts.."
+msgstr "Selecionar Conta"
+
+#: backup/templates/backup/remoteBackups.html:107
+#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:65
+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
+#: managePHP/templates/managePHP/installExtensions.html:62
+msgid "PHP"
+msgstr "PHP"
+
+#: backup/templates/backup/remoteBackups.html:109
+#: packages/templates/packages/createPackage.html:99
+#: packages/templates/packages/deletePackage.html:63
+#: packages/templates/packages/modifyPackage.html:112
+msgid "Package"
+msgstr "Pacote"
+
+#: backup/templates/backup/remoteBackups.html:110
+#: baseTemplate/templates/baseTemplate/index.html:514
+#: baseTemplate/templates/baseTemplate/index.html:516
+#: userManagment/templates/userManagment/createUser.html:47
+#: userManagment/templates/userManagment/modifyUser.html:54
+#: userManagment/templates/userManagment/userProfile.html:50
+#: websiteFunctions/templates/websiteFunctions/createWebsite.html:60
+#: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:67
+msgid "Email"
+msgstr "E-Mail"
+
#: backup/templates/backup/restore.html:3
msgid "Restore Website - CyberPanel"
msgstr "Restaurar Website - CyberPanel"
@@ -328,6 +460,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
#: managePHP/templates/managePHP/editPHPConfig.html:212
msgid "Error message:"
@@ -341,119 +474,166 @@ msgstr "Já existe um site relacionado com este backup."
msgid "Home - CyberPanel"
msgstr "Principal - CyberPanel"
-#: baseTemplate/templates/baseTemplate/homePage.html:14
+#: baseTemplate/templates/baseTemplate/homePage.html:13
msgid "Use the tabs to navigate through the control panel."
msgstr "Use as abas para navegar pelo painel de controlo."
-#: baseTemplate/templates/baseTemplate/homePage.html:24
+#: baseTemplate/templates/baseTemplate/homePage.html:23
#: websiteFunctions/templates/websiteFunctions/website.html:33
msgid "Usage"
msgstr "Uso"
-#: baseTemplate/templates/baseTemplate/homePage.html:35
+#: baseTemplate/templates/baseTemplate/homePage.html:34
#: baseTemplate/templates/baseTemplate/index.html:221
msgid "CPU Usage"
msgstr "Utilização de CPU"
-#: baseTemplate/templates/baseTemplate/homePage.html:56
+#: baseTemplate/templates/baseTemplate/homePage.html:55
#: baseTemplate/templates/baseTemplate/index.html:232
msgid "Ram Usage"
msgstr "Utilização de RAM"
-#: baseTemplate/templates/baseTemplate/homePage.html:75
+#: baseTemplate/templates/baseTemplate/homePage.html:74
msgid "Disk Usage '/'"
msgstr "Uso do Disco '/'"
-#: baseTemplate/templates/baseTemplate/homePage.html:99
+#: baseTemplate/templates/baseTemplate/homePage.html:98
msgid "HTTP Statistics"
msgstr "Estatísticas HTTP"
-#: baseTemplate/templates/baseTemplate/homePage.html:108
+#: baseTemplate/templates/baseTemplate/homePage.html:107
msgid "Available/Max Connections"
msgstr "Disponíveis/Máximo Ligações"
-#: baseTemplate/templates/baseTemplate/homePage.html:119
+#: baseTemplate/templates/baseTemplate/homePage.html:118
msgid "Available/Max SSL Connections"
msgstr "Disponíveis/Máximo Ligações SSL"
-#: baseTemplate/templates/baseTemplate/homePage.html:128
+#: baseTemplate/templates/baseTemplate/homePage.html:127
msgid "Requests Processing"
msgstr "Processamento de Pedidos"
-#: baseTemplate/templates/baseTemplate/homePage.html:137
+#: baseTemplate/templates/baseTemplate/homePage.html:136
msgid "Total Requests"
msgstr "Pedidos Totais"
-#: baseTemplate/templates/baseTemplate/homePage.html:177
+#: baseTemplate/templates/baseTemplate/homePage.html:173
+#: userManagment/templates/userManagment/index.html:13
+msgid "User Functions"
+msgstr "Funçõoes do Utilizador"
+
+#: baseTemplate/templates/baseTemplate/homePage.html:176
+#: 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:190
+#: baseTemplate/templates/baseTemplate/homePage.html:186
+#: websiteFunctions/templates/websiteFunctions/index.html:13
+msgid "Website Functions"
+msgstr "Funções do Website"
+
+#: baseTemplate/templates/baseTemplate/homePage.html:189
#: baseTemplate/templates/baseTemplate/index.html:360
+#: baseTemplate/templates/baseTemplate/index.html:444
+#: baseTemplate/templates/baseTemplate/index.html:445
#: baseTemplate/templates/baseTemplate/index.html:446
#: websiteFunctions/templates/websiteFunctions/listWebsites.html:21
msgid "Websites"
msgstr "Websites"
-#: baseTemplate/templates/baseTemplate/homePage.html:203
+#: baseTemplate/templates/baseTemplate/homePage.html:199
+#, fuzzy
+#| msgid "Modify Package"
+msgid "Add/Modify Packages"
+msgstr "Editar Pacote"
+
+#: baseTemplate/templates/baseTemplate/homePage.html:202
#: baseTemplate/templates/baseTemplate/index.html:366
+#: baseTemplate/templates/baseTemplate/index.html:461
#: baseTemplate/templates/baseTemplate/index.html:463
#: packages/templates/packages/index.html:13
msgid "Packages"
msgstr "Pacotes"
-#: baseTemplate/templates/baseTemplate/homePage.html:227
+#: baseTemplate/templates/baseTemplate/homePage.html:223
+#: 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/index.html:477
+#: baseTemplate/templates/baseTemplate/index.html:478
#: baseTemplate/templates/baseTemplate/index.html:479
-#: packages/templates/packages/createPackage.html:59
-#: packages/templates/packages/modifyPackage.html:63
+#: packages/templates/packages/createPackage.html:67
+#: packages/templates/packages/modifyPackage.html:73
#: websiteFunctions/templates/websiteFunctions/website.html:44
msgid "Databases"
msgstr "Bases de Dados"
-#: baseTemplate/templates/baseTemplate/homePage.html:239
+#: baseTemplate/templates/baseTemplate/homePage.html:235
+msgid "Control DNS"
+msgstr ""
+
+#: baseTemplate/templates/baseTemplate/homePage.html:238
#: 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:252
+#: baseTemplate/templates/baseTemplate/homePage.html:248
+#: ftp/templates/ftp/index.html:12
+msgid "FTP Functions"
+msgstr "Funções do FTP"
+
+#: baseTemplate/templates/baseTemplate/homePage.html:251
#: baseTemplate/templates/baseTemplate/index.html:378
+#: baseTemplate/templates/baseTemplate/index.html:536
#: baseTemplate/templates/baseTemplate/index.html:538
#: websiteFunctions/templates/websiteFunctions/website.html:39
msgid "FTP"
msgstr "FTP"
-#: baseTemplate/templates/baseTemplate/homePage.html:282
-#: packages/templates/packages/createPackage.html:67
-#: packages/templates/packages/modifyPackage.html:70
+#: baseTemplate/templates/baseTemplate/homePage.html:278
+#: baseTemplate/templates/baseTemplate/homePage.html:281
+#: packages/templates/packages/createPackage.html:75
+#: packages/templates/packages/modifyPackage.html:80
msgid "Emails"
msgstr "E-Mails"
-#: baseTemplate/templates/baseTemplate/homePage.html:295
+#: baseTemplate/templates/baseTemplate/homePage.html:291
+#: baseTemplate/templates/baseTemplate/homePage.html:294
#: tuning/templates/tuning/index.html:12
msgid "Server Tuning"
msgstr "Afinação do Servidor"
-#: baseTemplate/templates/baseTemplate/homePage.html:319
+#: 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
#: serverStatus/templates/serverStatus/index.html:13
msgid "Server Status"
msgstr "Estado do Servidor"
-#: baseTemplate/templates/baseTemplate/homePage.html:332
-#: baseTemplate/templates/baseTemplate/index.html:627
-#: managePHP/templates/managePHP/installExtensions.html:62
-msgid "PHP"
-msgstr "PHP"
+#: baseTemplate/templates/baseTemplate/homePage.html:328
+#, fuzzy
+#| msgid "Edit PHP Configurations"
+msgid "PHP Configurations"
+msgstr "Altere as Configurações PHP"
-#: baseTemplate/templates/baseTemplate/homePage.html:344
+#: baseTemplate/templates/baseTemplate/homePage.html:340
+#: baseTemplate/templates/baseTemplate/homePage.html:343
#: baseTemplate/templates/baseTemplate/index.html:643
#: websiteFunctions/templates/websiteFunctions/website.html:113
msgid "Logs"
msgstr "Logs"
-#: baseTemplate/templates/baseTemplate/homePage.html:367
+#: baseTemplate/templates/baseTemplate/homePage.html:363
+#: baseTemplate/templates/baseTemplate/homePage.html:366
+#: baseTemplate/templates/baseTemplate/index.html:659
#: baseTemplate/templates/baseTemplate/index.html:661
msgid "Security"
msgstr "Segurança"
@@ -468,26 +648,69 @@ msgstr "Estado do CPU"
msgid "Disk Usage"
msgstr "Uso do Disco"
+#: baseTemplate/templates/baseTemplate/index.html:275
+#: baseTemplate/templates/baseTemplate/index.html:278
+#: baseTemplate/templates/baseTemplate/index.html:282
+#, fuzzy
+#| msgid "Home - CyberPanel"
+msgid "CyberPanel"
+msgstr "Principal - CyberPanel"
+
#: baseTemplate/templates/baseTemplate/index.html:280
#: baseTemplate/templates/baseTemplate/index.html:284
msgid "Web Hosting Control Panel"
msgstr "Painel de Controlo de Alojamento Web"
+#: baseTemplate/templates/baseTemplate/index.html:286
+msgid "Close sidebar"
+msgstr ""
+
+#: baseTemplate/templates/baseTemplate/index.html:292
+#, fuzzy
+#| msgid "FTP Accounts"
+msgid "My Account"
+msgstr "Contas de FTP"
+
#: baseTemplate/templates/baseTemplate/index.html:309
msgid "Edit profile"
msgstr "Editar perfil"
#: baseTemplate/templates/baseTemplate/index.html:310
#: baseTemplate/templates/baseTemplate/index.html:433
+#: userManagment/templates/userManagment/index.html:26
#: userManagment/templates/userManagment/index.html:28
msgid "View Profile"
msgstr "Ver perfil"
#: baseTemplate/templates/baseTemplate/index.html:317
+#: baseTemplate/templates/baseTemplate/index.html:398
msgid "Logout"
msgstr "Sair"
+#: baseTemplate/templates/baseTemplate/index.html:328
+#: baseTemplate/templates/baseTemplate/index.html:332
+#: baseTemplate/templates/baseTemplate/index.html:336
+msgid "CPU Load Average"
+msgstr ""
+
+#: baseTemplate/templates/baseTemplate/index.html:340
+msgid "Fullscreen"
+msgstr ""
+
+#: baseTemplate/templates/baseTemplate/index.html:345
+#, fuzzy
+#| msgid "Server Status"
+msgid "System Status"
+msgstr "Estado do Servidor"
+
+#: baseTemplate/templates/baseTemplate/index.html:350
+#, fuzzy
+#| msgid "Dashboard"
+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
msgid "Tuning"
msgstr "Afinar"
@@ -496,10 +719,13 @@ msgstr "Afinar"
msgid "Overview"
msgstr "Visão Geral"
+#: baseTemplate/templates/baseTemplate/index.html:413
#: baseTemplate/templates/baseTemplate/index.html:415
+#: baseTemplate/templates/baseTemplate/index.html:417
msgid "Dashboard"
msgstr "Painel de Controlo"
+#: baseTemplate/templates/baseTemplate/index.html:418
#: baseTemplate/templates/baseTemplate/index.html:419
#: baseTemplate/templates/baseTemplate/versionManagment.html:10
msgid "Version Management"
@@ -515,6 +741,7 @@ msgid "Create New User"
msgstr "Criar Novo Utilizador"
#: baseTemplate/templates/baseTemplate/index.html:435
+#: userManagment/templates/userManagment/index.html:52
#: userManagment/templates/userManagment/index.html:54
#: userManagment/templates/userManagment/modifyUser.html:12
#: userManagment/templates/userManagment/modifyUser.html:120
@@ -525,6 +752,7 @@ msgstr "Modificar Utilizador"
#: userManagment/templates/userManagment/deleteUser.html:13
#: userManagment/templates/userManagment/deleteUser.html:20
#: userManagment/templates/userManagment/deleteUser.html:42
+#: userManagment/templates/userManagment/index.html:74
#: userManagment/templates/userManagment/index.html:76
msgid "Delete User"
msgstr "Apagar Utilizador"
@@ -532,17 +760,20 @@ msgstr "Apagar Utilizador"
#: baseTemplate/templates/baseTemplate/index.html:451
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:12
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:102
+#: websiteFunctions/templates/websiteFunctions/index.html:26
#: websiteFunctions/templates/websiteFunctions/index.html:28
msgid "Create Website"
msgstr "Criar Website"
#: baseTemplate/templates/baseTemplate/index.html:452
+#: websiteFunctions/templates/websiteFunctions/index.html:38
#: websiteFunctions/templates/websiteFunctions/index.html:40
#: websiteFunctions/templates/websiteFunctions/listWebsites.html:14
msgid "List Websites"
msgstr "Listar Websites"
#: baseTemplate/templates/baseTemplate/index.html:453
+#: websiteFunctions/templates/websiteFunctions/index.html:50
#: websiteFunctions/templates/websiteFunctions/index.html:52
#: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:12
#: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:19
@@ -559,13 +790,15 @@ msgstr "Suspender/Reativar"
#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:12
#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:19
#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:42
+#: websiteFunctions/templates/websiteFunctions/index.html:84
#: websiteFunctions/templates/websiteFunctions/index.html:86
msgid "Delete Website"
msgstr "Apagar Website"
#: baseTemplate/templates/baseTemplate/index.html:468
#: packages/templates/packages/createPackage.html:13
-#: packages/templates/packages/createPackage.html:76
+#: packages/templates/packages/createPackage.html:84
+#: packages/templates/packages/index.html:25
#: packages/templates/packages/index.html:27
msgid "Create Package"
msgstr "Criar Pacote"
@@ -574,15 +807,17 @@ msgstr "Criar Pacote"
#: packages/templates/packages/deletePackage.html:12
#: packages/templates/packages/deletePackage.html:18
#: packages/templates/packages/deletePackage.html:40
+#: packages/templates/packages/index.html:37
#: packages/templates/packages/index.html:39
msgid "Delete Package"
msgstr "Apagar Pacote"
#: baseTemplate/templates/baseTemplate/index.html:470
+#: packages/templates/packages/index.html:49
#: packages/templates/packages/index.html:51
#: packages/templates/packages/modifyPackage.html:9
#: packages/templates/packages/modifyPackage.html:15
-#: packages/templates/packages/modifyPackage.html:85
+#: packages/templates/packages/modifyPackage.html:95
msgid "Modify Package"
msgstr "Editar Pacote"
@@ -590,7 +825,9 @@ msgstr "Editar Pacote"
#: databases/templates/databases/createDatabase.html:12
#: databases/templates/databases/createDatabase.html:19
#: databases/templates/databases/createDatabase.html:68
+#: databases/templates/databases/index.html:25
#: databases/templates/databases/index.html:27
+#: manageSSL/templates/manageSSL/index.html:26
msgid "Create Database"
msgstr "Criar Base de Dados"
@@ -598,11 +835,14 @@ msgstr "Criar Base de Dados"
#: databases/templates/databases/deleteDatabase.html:12
#: databases/templates/databases/deleteDatabase.html:19
#: databases/templates/databases/deleteDatabase.html:53
+#: databases/templates/databases/index.html:37
#: databases/templates/databases/index.html:39
+#: manageSSL/templates/manageSSL/index.html:38
msgid "Delete Database"
msgstr "Apagar Base de Dados"
#: baseTemplate/templates/baseTemplate/index.html:486
+#: databases/templates/databases/index.html:53
#: databases/templates/databases/index.html:55
#: databases/templates/databases/listDataBases.html:13
#: databases/templates/databases/listDataBases.html:19
@@ -610,25 +850,29 @@ msgid "List Databases"
msgstr "Listar Base de Dados"
#: baseTemplate/templates/baseTemplate/index.html:487
+#: databases/templates/databases/index.html:65
#: databases/templates/databases/index.html:67
msgid "PHPMYAdmin"
msgstr "PHPMyAdmin"
#: baseTemplate/templates/baseTemplate/index.html:502
#: dns/templates/dns/createNameServer.html:12
-#: dns/templates/dns/createNameServer.html:76 dns/templates/dns/index.html:74
+#: dns/templates/dns/createNameServer.html:76 dns/templates/dns/index.html:72
+#: dns/templates/dns/index.html:74
msgid "Create Nameserver"
msgstr "Criar Nameserver"
#: baseTemplate/templates/baseTemplate/index.html:503
#: dns/templates/dns/createDNSZone.html:12
-#: dns/templates/dns/createDNSZone.html:40 dns/templates/dns/index.html:31
+#: dns/templates/dns/createDNSZone.html:40 dns/templates/dns/index.html:29
+#: dns/templates/dns/index.html:31 dns/templates/dns/index.html:84
#: dns/templates/dns/index.html:86
msgid "Create DNS Zone"
msgstr "Criar uma Zona DNS"
#: baseTemplate/templates/baseTemplate/index.html:504
-#: dns/templates/dns/deleteDNSZone.html:40 dns/templates/dns/index.html:43
+#: dns/templates/dns/deleteDNSZone.html:40 dns/templates/dns/index.html:41
+#: dns/templates/dns/index.html:43 dns/templates/dns/index.html:96
#: dns/templates/dns/index.html:98
msgid "Delete Zone"
msgstr "Apagar Zona"
@@ -637,31 +881,37 @@ msgstr "Apagar Zona"
msgid "Add/Delete Records"
msgstr "Adicionar/Apagar Registos"
-#: baseTemplate/templates/baseTemplate/index.html:516
-#: userManagment/templates/userManagment/createUser.html:47
-#: userManagment/templates/userManagment/modifyUser.html:54
-#: userManagment/templates/userManagment/userProfile.html:50
-#: websiteFunctions/templates/websiteFunctions/createWebsite.html:60
-#: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:67
-msgid "Email"
-msgstr "E-Mail"
+#: baseTemplate/templates/baseTemplate/index.html:521
+#: mailServer/templates/mailServer/createEmailAccount.html:12
+#: mailServer/templates/mailServer/createEmailAccount.html:19
+msgid "Create Email Account"
+msgstr "Criar Conta de E-Mail"
#: baseTemplate/templates/baseTemplate/index.html:521
#: mailServer/templates/mailServer/createEmailAccount.html:64
+#: mailServer/templates/mailServer/index.html:25
#: mailServer/templates/mailServer/index.html:27
msgid "Create Email"
msgstr "Criar E-Mail"
+#: baseTemplate/templates/baseTemplate/index.html:522
+#: mailServer/templates/mailServer/deleteEmailAccount.html:12
+#: mailServer/templates/mailServer/deleteEmailAccount.html:19
+msgid "Delete Email Account"
+msgstr "Apagar Conta de E-Mail"
+
#: baseTemplate/templates/baseTemplate/index.html:522
#: mailServer/templates/mailServer/deleteEmailAccount.html:56
+#: mailServer/templates/mailServer/index.html:37
#: mailServer/templates/mailServer/index.html:39
msgid "Delete Email"
msgstr "Apagar E-Mail"
#: baseTemplate/templates/baseTemplate/index.html:523
-#: databases/templates/databases/listDataBases.html:72
+#: databases/templates/databases/listDataBases.html:73
#: ftp/templates/ftp/listFTPAccounts.html:73
#: mailServer/templates/mailServer/changeEmailPassword.html:64
+#: mailServer/templates/mailServer/index.html:49
#: mailServer/templates/mailServer/index.html:51
msgid "Change Password"
msgstr "Alterar Palavra-Chave"
@@ -672,33 +922,35 @@ msgstr "Aceder ao Webmail"
#: baseTemplate/templates/baseTemplate/index.html:543
#: ftp/templates/ftp/createFTPAccount.html:12
-#: ftp/templates/ftp/createFTPAccount.html:19 ftp/templates/ftp/index.html:27
-#: websiteFunctions/templates/websiteFunctions/website.html:461
+#: 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
msgid "Create FTP Account"
msgstr "Criar Conta de FTP"
#: baseTemplate/templates/baseTemplate/index.html:544
#: ftp/templates/ftp/deleteFTPAccount.html:12
#: ftp/templates/ftp/deleteFTPAccount.html:18
-#: ftp/templates/ftp/deleteFTPAccount.html:52 ftp/templates/ftp/index.html:39
-#: websiteFunctions/templates/websiteFunctions/website.html:473
+#: 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
msgid "Delete FTP Account"
msgstr "Apagar Conta de FTP"
#: baseTemplate/templates/baseTemplate/index.html:545
-#: ftp/templates/ftp/index.html:51 ftp/templates/ftp/listFTPAccounts.html:13
+#: ftp/templates/ftp/index.html:49 ftp/templates/ftp/index.html:51
+#: ftp/templates/ftp/listFTPAccounts.html:13
#: ftp/templates/ftp/listFTPAccounts.html:19
msgid "List FTP Accounts"
msgstr "Listar Contas de FTP"
-#: baseTemplate/templates/baseTemplate/index.html:562
-msgid "Restore Back up"
-msgstr "Restaurar Backup"
-
#: baseTemplate/templates/baseTemplate/index.html:563
msgid "Add/Delete Destination"
msgstr "Adcionar/Apagar Destino"
+#: baseTemplate/templates/baseTemplate/index.html:573
#: baseTemplate/templates/baseTemplate/index.html:574
msgid "SSL"
msgstr "SSL"
@@ -724,34 +976,43 @@ msgid "NEW"
msgstr "NOVO"
#: baseTemplate/templates/baseTemplate/index.html:598
-#: tuning/templates/tuning/index.html:26
+#: 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
-#: tuning/templates/tuning/index.html:38
+#: 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
+#: 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
#: 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
+#: managePHP/templates/managePHP/installExtensions.html:13
+msgid "Install PHP Extensions"
+msgstr "Instalar Extensões do PHP"
+
+#: baseTemplate/templates/baseTemplate/index.html:632
+#: 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
+#: managePHP/templates/managePHP/index.html:36
#: managePHP/templates/managePHP/index.html:38
msgid "Edit PHP Configs"
msgstr "Editar configurações do PHP"
@@ -762,27 +1023,44 @@ msgstr "Log de Acessos"
#: baseTemplate/templates/baseTemplate/index.html:649
#: serverLogs/templates/serverLogs/errorLogs.html:14
+#: serverLogs/templates/serverLogs/index.html:37
#: serverLogs/templates/serverLogs/index.html:39
#: websiteFunctions/templates/websiteFunctions/website.html:133
msgid "Error Logs"
msgstr "Log de Erros"
+#: baseTemplate/templates/baseTemplate/index.html:650
+#: 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
msgid "Email Log"
msgstr "Log de E-Mail"
#: baseTemplate/templates/baseTemplate/index.html:651
#: 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
+#, fuzzy
+#| msgid "Firewall"
+msgid "Firewall Home"
+msgstr "Firewall"
+
+#: baseTemplate/templates/baseTemplate/index.html:666
+#: firewall/templates/firewall/index.html:25
#: firewall/templates/firewall/index.html:27
msgid "Firewall"
msgstr "Firewall"
#: baseTemplate/templates/baseTemplate/index.html:667
+#: firewall/templates/firewall/index.html:36
#: firewall/templates/firewall/index.html:38
#: firewall/templates/firewall/secureSSH.html:13
#: firewall/templates/firewall/secureSSH.html:20
@@ -849,7 +1127,7 @@ msgid "Create a new database on this page."
msgstr "Crie uma nova base de dados nesta página."
#: databases/templates/databases/createDatabase.html:42
-#: databases/templates/databases/listDataBases.html:87
+#: databases/templates/databases/listDataBases.html:88
msgid "Database Name"
msgstr "Nome da Base de Dados"
@@ -889,10 +1167,6 @@ msgstr "Base de Dados apagada com sucesso."
msgid "Database Functions - CyberPanel"
msgstr "Funções da Base de Dados - CyberPanel"
-#: databases/templates/databases/index.html:12
-msgid "Database Functions"
-msgstr "Funções da Base de Dados"
-
#: databases/templates/databases/index.html:13
msgid "Create, edit and delete databases on this page."
msgstr "Crie, edite e apague base de dados nesta página."
@@ -918,21 +1192,27 @@ msgstr "Selecionar Domínio"
msgid "Records successfully fetched for"
msgstr "Registos obtidos com sucesso para"
-#: databases/templates/databases/listDataBases.html:53
+#: databases/templates/databases/listDataBases.html:50
+#, fuzzy
+#| msgid "Password changed for"
+msgid "Password changed for: "
+msgstr "Palavra-chave alterada para"
+
+#: databases/templates/databases/listDataBases.html:54
msgid "Cannot change password for "
msgstr "Impossível alterar palavra-chave para "
-#: databases/templates/databases/listDataBases.html:58
+#: databases/templates/databases/listDataBases.html:59
#: firewall/templates/firewall/firewall.html:166
#: 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"
-#: databases/templates/databases/listDataBases.html:88
+#: databases/templates/databases/listDataBases.html:89
msgid "Database User"
msgstr "Utilizador da Base de Dados"
-#: databases/templates/databases/listDataBases.html:97
+#: databases/templates/databases/listDataBases.html:98
#: ftp/templates/ftp/listFTPAccounts.html:100
msgid "Change"
msgstr "Alterar"
@@ -957,6 +1237,38 @@ msgstr ""
msgid "Add Records"
msgstr "Adicionar Registos"
+#: dns/templates/dns/addDeleteDNSRecords.html:53
+#: dns/templates/dns/addDeleteDNSRecords.html:131
+#: firewall/templates/firewall/firewall.html:128
+#: serverStatus/templates/serverStatus/litespeedStatus.html:40
+msgid "Name"
+msgstr "Nome"
+
+#: dns/templates/dns/addDeleteDNSRecords.html:69
+msgid "IPV6"
+msgstr ""
+
+#: dns/templates/dns/addDeleteDNSRecords.html:78
+#: dns/templates/dns/addDeleteDNSRecords.html:133
+msgid "Priority"
+msgstr "Prioridade"
+
+#: dns/templates/dns/addDeleteDNSRecords.html:87
+#: dns/templates/dns/createDNSZone.html:27
+#: dns/templates/dns/createNameServer.html:27
+#: websiteFunctions/templates/websiteFunctions/createWebsite.html:52
+#: websiteFunctions/templates/websiteFunctions/website.html:263
+msgid "Domain Name"
+msgstr "Nome de Domínio"
+
+#: dns/templates/dns/addDeleteDNSRecords.html:95
+msgid "Policy"
+msgstr ""
+
+#: dns/templates/dns/addDeleteDNSRecords.html:103
+msgid "Text"
+msgstr ""
+
#: dns/templates/dns/addDeleteDNSRecords.html:111
#: firewall/templates/firewall/firewall.html:109
msgid "Add"
@@ -966,20 +1278,10 @@ msgstr "Adicionar"
msgid "Type"
msgstr "Tipo"
-#: dns/templates/dns/addDeleteDNSRecords.html:131
-#: firewall/templates/firewall/firewall.html:128
-#: serverStatus/templates/serverStatus/litespeedStatus.html:40
-msgid "Name"
-msgstr "Nome"
-
#: dns/templates/dns/addDeleteDNSRecords.html:132
msgid "Value"
msgstr "Valor"
-#: dns/templates/dns/addDeleteDNSRecords.html:133
-msgid "Priority"
-msgstr "Prioridade"
-
#: dns/templates/dns/addDeleteDNSRecords.html:160
msgid "Cannot fetch records. Error message:"
msgstr "Impossível obter registos. Mensagem de erro:"
@@ -1018,12 +1320,6 @@ msgstr ""
msgid "Details"
msgstr "Detalhes"
-#: dns/templates/dns/createDNSZone.html:27
-#: dns/templates/dns/createNameServer.html:27
-#: websiteFunctions/templates/websiteFunctions/createWebsite.html:52
-msgid "Domain Name"
-msgstr "Nome de Domínio"
-
#: dns/templates/dns/createDNSZone.html:51
msgid "Cannot create DNS Zone. Error message:"
msgstr "Impossível criar Zona de DNS. Mensagem de erro:"
@@ -1114,6 +1410,12 @@ msgstr "Funções do DNS"
msgid "Create, edit and delete DNS zones on this page."
msgstr "Crie, edite e apague zonas do DNS nesta página."
+#: dns/templates/dns/index.html:53 dns/templates/dns/index.html:108
+#, fuzzy
+#| msgid "Add/Delete Records"
+msgid "Add Delete Records"
+msgstr "Adicionar/Apagar Registos"
+
#: dns/templates/dns/index.html:55 dns/templates/dns/index.html:110
msgid "Add Delete/Records"
msgstr "Adicionar Apagar/Registos"
@@ -1188,9 +1490,10 @@ msgid "Secure SSH - CyberPanel"
msgstr "SSH Seguro - CyberPanel"
#: firewall/templates/firewall/secureSSH.html:14
-#: managePHP/templates/managePHP/editPHPConfig.html:15
-msgid "Edit PHP Configurations on this page."
-msgstr "Editar as Configurações do PHP nesta página."
+#, fuzzy
+#| msgid "SSH Configurations Saved."
+msgid "Secure or harden SSH Configurations."
+msgstr "Configurações do SSH Guardadas."
#: firewall/templates/firewall/secureSSH.html:28
#: managePHP/templates/managePHP/editPHPConfig.html:29
@@ -1237,8 +1540,8 @@ msgstr "Adicionar Chave"
#: firewall/templates/firewall/secureSSH.html:158
#: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:55
-#: websiteFunctions/templates/websiteFunctions/website.html:303
-#: websiteFunctions/templates/websiteFunctions/website.html:363
+#: websiteFunctions/templates/websiteFunctions/website.html:527
+#: websiteFunctions/templates/websiteFunctions/website.html:587
msgid "Save"
msgstr "Guardar"
@@ -1266,6 +1569,10 @@ msgstr "Palavra-Chave FTP"
msgid "Path (Relative)"
msgstr "Caminho (Relativo)"
+#: ftp/templates/ftp/createFTPAccount.html:61
+msgid "Leave empty to select default home directory."
+msgstr ""
+
#: ftp/templates/ftp/createFTPAccount.html:72
msgid "Create FTP"
msgstr "Criar FTP"
@@ -1316,10 +1623,6 @@ msgstr ""
msgid "FTP Functions - CyberPanel"
msgstr "Funções do FTP - CyberPanel"
-#: ftp/templates/ftp/index.html:12
-msgid "FTP Functions"
-msgstr "Funções do FTP"
-
#: ftp/templates/ftp/index.html:13
msgid "Delete and create FTP accounts on this page."
msgstr "Apague e crie contas de FTP nesta página."
@@ -1383,11 +1686,6 @@ msgstr "Atualmente nenhuma conta de e-mail existe para este domínio."
msgid "Create Email Account - CyberPanel"
msgstr "Criar Conta de E-Mail - CyberPanel"
-#: mailServer/templates/mailServer/createEmailAccount.html:12
-#: mailServer/templates/mailServer/createEmailAccount.html:19
-msgid "Create Email Account"
-msgstr "Criar Conta de E-Mail"
-
#: mailServer/templates/mailServer/createEmailAccount.html:13
msgid "Select a website from the list, to create an email account."
msgstr "Selecione um website da lista, para criar uma conta de e-mail."
@@ -1408,11 +1706,6 @@ msgstr " foi criado com sucesso."
msgid "Delete Email Account - CyberPanel"
msgstr "Apagar Conta de E-Mail - CyberPanel"
-#: mailServer/templates/mailServer/deleteEmailAccount.html:12
-#: mailServer/templates/mailServer/deleteEmailAccount.html:19
-msgid "Delete Email Account"
-msgstr "Apagar Conta de E-Mail"
-
#: mailServer/templates/mailServer/deleteEmailAccount.html:13
msgid "Select a website from the list, to delete an email account."
msgstr "Selecione um website da lista, para apagar uma conta de e-mail."
@@ -1442,6 +1735,10 @@ msgstr "Altere as Configurações PHP - CyberPanel"
msgid "Edit PHP Configurations"
msgstr "Altere as Configurações PHP"
+#: managePHP/templates/managePHP/editPHPConfig.html:15
+msgid "Edit PHP Configurations on this page."
+msgstr "Editar as Configurações do PHP nesta página."
+
#: managePHP/templates/managePHP/editPHPConfig.html:35
msgid "Advanced"
msgstr "Avançado"
@@ -1452,6 +1749,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
msgid "Select PHP"
msgstr "Selecionar PHP"
@@ -1508,10 +1806,6 @@ msgstr "Altere as suas Configurações PHP para atender às suas necessidades."
msgid "Install PHP Extensions - CyberPanel"
msgstr "Instalar Extensões do PHP - CyberPanel"
-#: managePHP/templates/managePHP/installExtensions.html:13
-msgid "Install PHP Extensions"
-msgstr "Instalar Extensões do PHP"
-
#: managePHP/templates/managePHP/installExtensions.html:14
msgid "Install/uninstall php extensions on this page."
msgstr "Instale/desinstale extensões do php nesta página."
@@ -1521,6 +1815,12 @@ msgstr "Instale/desinstale extensões do php nesta página."
msgid "Select PHP Version"
msgstr "Selecione Versão do PHP"
+#: managePHP/templates/managePHP/installExtensions.html:48
+#, fuzzy
+#| msgid "Install Extensions"
+msgid "Search Extensions.."
+msgstr "Instalar Extensões"
+
#: managePHP/templates/managePHP/installExtensions.html:63
msgid "Extension Name"
msgstr "Nome da Extensão"
@@ -1635,38 +1935,47 @@ msgid "Package Name"
msgstr "Nome do Pacote"
#: packages/templates/packages/createPackage.html:35
-#: packages/templates/packages/modifyPackage.html:39
+#: packages/templates/packages/modifyPackage.html:40
+#: websiteFunctions/templates/websiteFunctions/website.html:223
+#, fuzzy
+#| msgid "Domain Name"
+msgid "Domains"
+msgstr "Nome de Domínio"
+
+#: packages/templates/packages/createPackage.html:39
+#: packages/templates/packages/modifyPackage.html:44
+#, fuzzy
+#| msgid "( 0 = Unlimited )"
+msgid "(0 = Unlimited)"
+msgstr "( 0 = Ilimitado )"
+
+#: packages/templates/packages/createPackage.html:43
+#: packages/templates/packages/modifyPackage.html:49
msgid "Disk Space"
msgstr "Espaço do Disco"
-#: packages/templates/packages/createPackage.html:39
#: packages/templates/packages/createPackage.html:47
-#: packages/templates/packages/modifyPackage.html:43
-#: packages/templates/packages/modifyPackage.html:51
+#: packages/templates/packages/createPackage.html:55
+#: packages/templates/packages/modifyPackage.html:53
+#: packages/templates/packages/modifyPackage.html:61
msgid "MB (0 = Unlimited)"
msgstr "MB (0 = Ilimitado)"
-#: packages/templates/packages/createPackage.html:43
-#: packages/templates/packages/modifyPackage.html:47
+#: packages/templates/packages/createPackage.html:51
+#: packages/templates/packages/modifyPackage.html:57
msgid "Bandwidth"
msgstr "Largura de Banda"
-#: packages/templates/packages/createPackage.html:52
-#: packages/templates/packages/modifyPackage.html:56
+#: packages/templates/packages/createPackage.html:60
+#: packages/templates/packages/modifyPackage.html:66
msgid "FTP Accounts"
msgstr "Contas de FTP"
-#: packages/templates/packages/createPackage.html:87
+#: packages/templates/packages/createPackage.html:95
msgid "Cannot create package. Error message:"
msgstr "Impossível criar pacote. Mensagem de erro:"
-#: packages/templates/packages/createPackage.html:91
-#: packages/templates/packages/deletePackage.html:63
-#: packages/templates/packages/modifyPackage.html:102
-msgid "Package"
-msgstr "Pacote"
-
-#: packages/templates/packages/createPackage.html:91
+#: packages/templates/packages/createPackage.html:99
msgid "Successfully Created"
msgstr "Criado com Sucesso"
@@ -1698,15 +2007,15 @@ msgstr "Pacotes - CyberPanel"
msgid "Modify Package - CyberPanel"
msgstr "Alterar Pacote - CyberPanel"
-#: packages/templates/packages/modifyPackage.html:94
+#: packages/templates/packages/modifyPackage.html:104
msgid "Cannot fetch package details. Error message:"
msgstr "Impossível obter detalhes do pacote. Mensagem de erro:"
-#: packages/templates/packages/modifyPackage.html:98
+#: packages/templates/packages/modifyPackage.html:108
msgid "Package Details Successfully Fetched"
msgstr "Detalhes do Pacato Obtidos com Sucesso"
-#: packages/templates/packages/modifyPackage.html:102
+#: packages/templates/packages/modifyPackage.html:112
msgid "Successfully Modified"
msgstr "Alterado com Sucesso"
@@ -1715,6 +2024,7 @@ msgid "Access Logs - CyberPanel"
msgstr "Logs de Acesso - CyberPanel"
#: serverLogs/templates/serverLogs/accessLogs.html:17
+#: serverLogs/templates/serverLogs/index.html:25
#: serverLogs/templates/serverLogs/index.html:27
#: websiteFunctions/templates/websiteFunctions/website.html:121
msgid "Access Logs"
@@ -1762,11 +2072,6 @@ msgstr ""
msgid "Error Logs - CyberPanel"
msgstr "Logs de Erros - CyberPanel"
-#: serverLogs/templates/serverLogs/emailLogs.html:14
-#: serverLogs/templates/serverLogs/index.html:51
-msgid "Email Logs"
-msgstr "Logs de E-Mail"
-
#: serverLogs/templates/serverLogs/emailLogs.html:15
msgid "Email Logs for main web server."
msgstr "Logs de E-Mail para o servidor web principal."
@@ -2105,6 +2410,7 @@ msgid "Must contain one number and one special character."
msgstr "Deverá conter um número e um caracter especial."
#: userManagment/templates/userManagment/createUser.html:143
+#: userManagment/templates/userManagment/index.html:40
#: userManagment/templates/userManagment/index.html:42
msgid "Create User"
msgstr "Criar Utilizador"
@@ -2152,10 +2458,6 @@ msgstr "Utilizador "
msgid "User Functions - CyberPanel"
msgstr "Funções do Utilizador - CyberPanel"
-#: userManagment/templates/userManagment/index.html:13
-msgid "User Functions"
-msgstr "Funçõoes do Utilizador"
-
#: userManagment/templates/userManagment/index.html:14
msgid "Create, edit and delete users on this page."
msgstr "Crie, editE e elimine utilizadores nesta página."
@@ -2235,14 +2537,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
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
msgid "Additional Features"
msgstr "Funcionalidades Adicionais"
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:91
+#: websiteFunctions/templates/websiteFunctions/website.html:306
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."
@@ -2252,14 +2558,17 @@ msgstr ""
"próprio SSL mais tarde."
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:113
+#: websiteFunctions/templates/websiteFunctions/website.html:328
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
msgid "Website with domain"
msgstr "Website com o domínio"
#: websiteFunctions/templates/websiteFunctions/createWebsite.html:117
+#: websiteFunctions/templates/websiteFunctions/website.html:332
msgid " is Successfully Created"
msgstr " foi Criado com Sucesso"
@@ -2279,10 +2588,6 @@ msgstr ""
msgid "Cannot delete website, Error message: "
msgstr "Impossível apagar website, Mensagem de erro: "
-#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:65
-msgid "Website"
-msgstr "Website"
-
#: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:65
msgid "Successfully Deleted."
msgstr "Apagado com Sucesso."
@@ -2291,10 +2596,7 @@ msgstr "Apagado com Sucesso."
msgid "Website Functions - CyberPanel"
msgstr "Funções do Website - CyberPaneç"
-#: websiteFunctions/templates/websiteFunctions/index.html:13
-msgid "Website Functions"
-msgstr "Funções do Website"
-
+#: websiteFunctions/templates/websiteFunctions/index.html:70
#: websiteFunctions/templates/websiteFunctions/index.html:72
#: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:13
#: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:20
@@ -2386,6 +2688,18 @@ msgstr "Permitido"
msgid "Bandwidth Usage"
msgstr "Uso de Banda"
+#: websiteFunctions/templates/websiteFunctions/website.html:119
+#, fuzzy
+#| msgid "Access Logs"
+msgid "Load Access Logs"
+msgstr "Logs de Acesso"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:131
+#, fuzzy
+#| msgid "Error Logs"
+msgid "Load Error Logs"
+msgstr "Log de Erros"
+
#: websiteFunctions/templates/websiteFunctions/website.html:147
msgid "Logs Fetched"
msgstr "Logs Obtidos"
@@ -2405,84 +2719,161 @@ msgstr "Próximo"
msgid "Previous"
msgstr "Anterior"
-#: websiteFunctions/templates/websiteFunctions/website.html:227
-msgid "Configurations"
-msgstr "Configurações"
+#: websiteFunctions/templates/websiteFunctions/website.html:230
+#: websiteFunctions/templates/websiteFunctions/website.html:232
+#, fuzzy
+#| msgid "Add Destination"
+msgid "Add Domains"
+msgstr "Adicionar Destino"
-#: websiteFunctions/templates/websiteFunctions/website.html:235
-msgid "Edit vHost Main Configurations"
-msgstr "Alterar as Configurações do vHost Principal"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:247
-msgid "Add Rewrite Rules (.htaccess)"
-msgstr "Adicionar Regras Rewrite (.htaccess)"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:259
-msgid "Add SSL"
-msgstr "Adicionar SSL"
+#: websiteFunctions/templates/websiteFunctions/website.html:242
+#: websiteFunctions/templates/websiteFunctions/website.html:244
+#, fuzzy
+#| msgid "Select Domain"
+msgid "List Domains"
+msgstr "Selecionar Domínio"
#: websiteFunctions/templates/websiteFunctions/website.html:274
-msgid "SSL Saved"
-msgstr "SSL Guardado"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:279
-msgid "Could not save SSL. Error message:"
-msgstr "Impossível guardar SSL. Mensagem de erro:"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:329
-msgid "Current configuration in the file fetched."
-msgstr "Configuração atual do ficheiro obtida."
-
-#: websiteFunctions/templates/websiteFunctions/website.html:334
-#: websiteFunctions/templates/websiteFunctions/website.html:347
-msgid "Could not fetch current configuration. Error message:"
-msgstr "Impossível obter configuração atual. Mensagem de erro:"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:343
-#: websiteFunctions/templates/websiteFunctions/website.html:398
-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:384
-msgid "Current rewrite rules in the file fetched."
-msgstr "Regras Rewrite atuais no ficheiro obtidas."
-
-#: websiteFunctions/templates/websiteFunctions/website.html:389
-msgid "Could not fetch current rewrite rules. Error message:"
-msgstr "Impossível obter regras Rewrite atuais. Mensagem de erro:"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:402
-msgid "Could not save rewrite rules. Error message:"
-msgstr "Impossível guardar regras Rewrite. Mensagem de erro:"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:418
-msgid "Save Rewrite Rules"
-msgstr "Guardar Regras Rewrite"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:441
-msgid "Files"
-msgstr "Ficheiros"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:450
-msgid "File Manager"
-msgstr "Gestor de Ficheiros"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:490
-msgid "Application Installer"
-msgstr "Instalador de Aplicações"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:498
-msgid "Wordpress with LSCache"
-msgstr "Wordpress com LSCache"
-
-#: websiteFunctions/templates/websiteFunctions/website.html:510
+#: websiteFunctions/templates/websiteFunctions/website.html:733
msgid "Path"
msgstr "Caminho"
-#: websiteFunctions/templates/websiteFunctions/website.html:532
+#: websiteFunctions/templates/websiteFunctions/website.html:276
+msgid "This path is relative to: "
+msgstr ""
+
+#: websiteFunctions/templates/websiteFunctions/website.html:276
+msgid "Leave empty to set default."
+msgstr ""
+
+#: websiteFunctions/templates/websiteFunctions/website.html:317
+#, fuzzy
+#| msgid "Create Email"
+msgid "Create Domain"
+msgstr "Criar E-Mail"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:360
+#, fuzzy
+#| msgid "Version Management"
+msgid "PHP Version Changed to:"
+msgstr "Gestão de Versões"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:364
+#, fuzzy
+#| msgid "Delete"
+msgid "Deleted:"
+msgstr "Apagar"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:368
+#, fuzzy
+#| msgid "SSL Issued for"
+msgid "SSL Issued:"
+msgstr "SSL Emitida para"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:391
+msgid "Close"
+msgstr ""
+
+#: websiteFunctions/templates/websiteFunctions/website.html:423
+#, fuzzy
+#| msgid "Issue SSL"
+msgid "Issue"
+msgstr "Emitir SSL"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:451
+msgid "Configurations"
+msgstr "Configurações"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:457
+#, 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
+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
+msgid "Add Rewrite Rules (.htaccess)"
+msgstr "Adicionar Regras Rewrite (.htaccess)"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:481
+#, fuzzy
+#| msgid "Add SSL"
+msgid "Add Your Own SSL"
+msgstr "Adicionar SSL"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:483
+msgid "Add SSL"
+msgstr "Adicionar SSL"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:498
+msgid "SSL Saved"
+msgstr "SSL Guardado"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:503
+msgid "Could not save SSL. Error message:"
+msgstr "Impossível guardar SSL. Mensagem de erro:"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:553
+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
+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
+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
+msgid "Current rewrite rules in the file fetched."
+msgstr "Regras Rewrite atuais no ficheiro obtidas."
+
+#: websiteFunctions/templates/websiteFunctions/website.html:613
+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
+msgid "Could not save rewrite rules. Error message:"
+msgstr "Impossível guardar regras Rewrite. Mensagem de erro:"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:642
+msgid "Save Rewrite Rules"
+msgstr "Guardar Regras Rewrite"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:665
+msgid "Files"
+msgstr "Ficheiros"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:672
+#: websiteFunctions/templates/websiteFunctions/website.html:674
+msgid "File Manager"
+msgstr "Gestor de Ficheiros"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:713
+msgid "Application Installer"
+msgstr "Instalador de Aplicações"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:719
+#, fuzzy
+#| msgid "Wordpress with LSCache"
+msgid "Install wordpress with LSCache"
+msgstr "Wordpress com LSCache"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:721
+msgid "Wordpress with LSCache"
+msgstr "Wordpress com LSCache"
+
+#: websiteFunctions/templates/websiteFunctions/website.html:755
msgid "Installation failed. Error message:"
msgstr "Instalação falhou. Mensagem de erro:"
-#: websiteFunctions/templates/websiteFunctions/website.html:536
+#: websiteFunctions/templates/websiteFunctions/website.html:759
msgid "Installation successful. To complete the setup visit:"
msgstr "Instalação com sucesso. Para completar:"
diff --git a/loginSystem/models.py b/loginSystem/models.py
index 3df3e30ff..940d6d9b6 100644
--- a/loginSystem/models.py
+++ b/loginSystem/models.py
@@ -14,7 +14,5 @@ class Administrator(models.Model):
type = models.IntegerField()
owner = models.IntegerField(default=1)
- userAccountsLimit = models.IntegerField(default=0)
- websitesLimit = models.IntegerField(default=0)
- initUserAccountsLimit = models.IntegerField(default=1)
- initWebsitesLimit = models.IntegerField(default=1)
\ No newline at end of file
+ initUserAccountsLimit = models.IntegerField(default=0)
+ initWebsitesLimit = models.IntegerField(default=0)
\ No newline at end of file
diff --git a/loginSystem/models.pyc b/loginSystem/models.pyc
index 9ff7baf7b..f2f57ef91 100644
Binary files a/loginSystem/models.pyc and b/loginSystem/models.pyc differ
diff --git a/loginSystem/views.py b/loginSystem/views.py
index 102185022..6b660cfc8 100644
--- a/loginSystem/views.py
+++ b/loginSystem/views.py
@@ -121,7 +121,7 @@ def loadLoginPage(request):
package = Package(admin=admin, packageName="Default", diskSpace=1000,
bandwidth=1000, ftpAccounts=1000, dataBases=1000,
- emailAccounts=1000)
+ emailAccounts=1000,allowedDomains=20)
package.save()
newFWRule = FirewallRules(name="panel", proto="tcp", port="8090")
diff --git a/manageSSL/views.py b/manageSSL/views.py
index e084bc39f..7f9f5a0f3 100644
--- a/manageSSL/views.py
+++ b/manageSSL/views.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
from django.shortcuts import render,redirect
from loginSystem.views import loadLoginPage
-from websiteFunctions.models import Websites
+from websiteFunctions.models import Websites,ChildDomains
from loginSystem.models import Administrator
from plogical.virtualHostUtilities import virtualHostUtilities
from plogical.sslUtilities import sslUtilities
@@ -73,7 +73,7 @@ def issueSSL(request):
data = json.loads(request.body)
virtualHost = data['virtualHost']
- website = Websites.objects.get(domain=virtualHost)
+ website = ChildDomains.objects.get(domain=virtualHost)
srcPrivKey = "/etc/letsencrypt/live/" + virtualHost + "/privkey.pem"
srcFullChain = "/etc/letsencrypt/live/" + virtualHost + "/fullchain.pem"
@@ -92,7 +92,13 @@ def issueSSL(request):
if not (os.path.exists(srcPrivKey) and os.path.exists(srcFullChain)):
- ssl_responce = sslUtilities.obtainSSLForADomain(virtualHost, adminEmail)
+ path = ''
+ try:
+ path = data['path']
+ except:
+ path = "/home/"+virtualHost+"/public_html"
+
+ ssl_responce = sslUtilities.obtainSSLForADomain(virtualHost, adminEmail,path)
if ssl_responce == 1:
sslUtilities.installSSLForDomain(virtualHost)
installUtilities.reStartLiteSpeed()
@@ -136,12 +142,12 @@ def issueSSL(request):
return HttpResponse(json_data)
except BaseException,msg:
- data_ret = {"SSL": 1,
+ data_ret = {"SSL": 0,
'error_message': str(msg)}
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
except KeyError:
- data_ret = {"SSL": 1,
+ data_ret = {"SSL": 0,
'error_message': str(msg)}
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
@@ -229,7 +235,8 @@ def obtainHostNameSSL(request):
if not (os.path.exists(srcPrivKey) and os.path.exists(srcFullChain)):
- ssl_responce = sslUtilities.obtainSSLForADomain(virtualHost, adminEmail)
+ path = "/home/" + virtualHost + "/public_html"
+ ssl_responce = sslUtilities.obtainSSLForADomain(virtualHost, adminEmail,path)
if ssl_responce == 1:
sslUtilities.installSSLForDomain(virtualHost)
installUtilities.reStartLiteSpeed()
@@ -291,12 +298,12 @@ def obtainHostNameSSL(request):
return HttpResponse(json_data)
except BaseException,msg:
- data_ret = {"SSL": 1,
+ data_ret = {"SSL": 0,
'error_message': str(msg)}
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
except KeyError:
- data_ret = {"SSL": 1,
+ data_ret = {"SSL": 0,
'error_message': str(msg)}
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
\ No newline at end of file
diff --git a/packages/models.py b/packages/models.py
index 20c621af2..145d09259 100644
--- a/packages/models.py
+++ b/packages/models.py
@@ -14,3 +14,4 @@ class Package(models.Model):
emailAccounts = models.IntegerField(null=True)
dataBases = models.IntegerField(default=0)
ftpAccounts = models.IntegerField(default=0)
+ allowedDomains = models.IntegerField(default=0)
diff --git a/packages/models.pyc b/packages/models.pyc
index a4f3900f5..6d468e235 100644
Binary files a/packages/models.pyc and b/packages/models.pyc differ
diff --git a/packages/static/packages/packages.js b/packages/static/packages/packages.js
index 8145c2236..925f00e40 100644
--- a/packages/static/packages/packages.js
+++ b/packages/static/packages/packages.js
@@ -62,7 +62,8 @@ app.controller('createPackage', function($scope,$http) {
bandwidth: bandwidth,
ftpAccounts: ftpAccounts,
dataBases: dataBases,
- emails:emails
+ emails:emails,
+ allowedDomains:$scope.allowedDomains
};
var config = {
@@ -238,6 +239,7 @@ app.controller('modifyPackages', function($scope,$http) {
$scope.ftpAccounts = response.data.ftpAccounts;
$scope.dataBases = response.data.dataBases;
$scope.emails = response.data.emails;
+ $scope.allowedDomains = response.data.allowedDomains;
$scope.modifyButton = "Save Details"
@@ -285,7 +287,8 @@ app.controller('modifyPackages', function($scope,$http) {
bandwidth:bandwidth,
ftpAccounts:ftpAccounts,
dataBases:dataBases,
- emails:emails
+ emails:emails,
+ allowedDomains:$scope.allowedDomains,
};
var config = {
diff --git a/packages/templates/packages/createPackage.html b/packages/templates/packages/createPackage.html
index 14a68fae7..599f876da 100644
--- a/packages/templates/packages/createPackage.html
+++ b/packages/templates/packages/createPackage.html
@@ -31,6 +31,14 @@
+ {{ admin }}_{$ packageName $}
+
+
+
+
+
+ {% trans "(0 = Unlimited)" %}
+
diff --git a/packages/templates/packages/modifyPackage.html b/packages/templates/packages/modifyPackage.html
index b02cb2c1a..b55cf44a0 100644
--- a/packages/templates/packages/modifyPackage.html
+++ b/packages/templates/packages/modifyPackage.html
@@ -35,6 +35,16 @@
+
+
+
+
+
+
+
+
+
+
+
+ {% trans "(0 = Unlimited)" %}
+
diff --git a/packages/views.py b/packages/views.py
index f1b786ce4..fa26f1017 100644
--- a/packages/views.py
+++ b/packages/views.py
@@ -74,6 +74,7 @@ def submitPackage(request):
packageDatabases = int(data['dataBases'])
ftpAccounts = int(data['ftpAccounts'])
emails = int(data['emails'])
+ allowedDomains = int(data['allowedDomains'])
admin = Administrator.objects.get(pk=request.session['userID'])
@@ -81,7 +82,7 @@ def submitPackage(request):
packageName = admin.userName+"_"+packageName
package = Package(admin=admin, packageName=packageName, diskSpace=packageSpace,
- bandwidth=packageBandwidth, ftpAccounts=ftpAccounts, dataBases=packageDatabases,emailAccounts=emails)
+ bandwidth=packageBandwidth, ftpAccounts=ftpAccounts, dataBases=packageDatabases,emailAccounts=emails,allowedDomains=allowedDomains)
package.save()
@@ -171,7 +172,7 @@ def submitModify(request):
emails = modifyPack.emailAccounts
data_ret = {'emails':emails,'modifyStatus': 1,'error_message': "None",
- "diskSpace":diskSpace,"bandwidth":bandwidth,"ftpAccounts":ftpAccounts,"dataBases":dataBases}
+ "diskSpace":diskSpace,"bandwidth":bandwidth,"ftpAccounts":ftpAccounts,"dataBases":dataBases,"allowedDomains":modifyPack.allowedDomains}
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
@@ -201,6 +202,7 @@ def saveChanges(request):
modifyPack.ftpAccounts = data['ftpAccounts']
modifyPack.dataBases = data['dataBases']
modifyPack.emailAccounts = data['emails']
+ modifyPack.allowedDomains = data['allowedDomains']
modifyPack.save()
data_ret = {'saveStatus': 1,'error_message': "None"}
diff --git a/plogical/backupUtilities.py b/plogical/backupUtilities.py
index afb0b82cb..4b6cb2acd 100644
--- a/plogical/backupUtilities.py
+++ b/plogical/backupUtilities.py
@@ -10,7 +10,7 @@ import tarfile
from multiprocessing import Process
import json
import requests
-
+import signal
class backupUtilities:
@@ -27,18 +27,25 @@ class backupUtilities:
status.close()
count = 0
+ dbCheck = 0
for items in meta:
if count==0:
- domainName = items.strip('\n')
+ domainName = items.split('-')[0]
make_archive(tempStoragePath+"/public_html", 'gztar', "/home/"+domainName+"/public_html")
count = count + 1
else:
- dbName = items.split('-')[0]
- status = open(backupPath + 'status', "w")
- status.write(backupName + "\n")
- status.write("Backing up database: "+dbName)
- status.close()
- mysqlUtilities.mysqlUtilities.createDatabaseBackup(dbName,tempStoragePath)
+ if items.find("Databases")>-1:
+ dbCheck = 1
+ continue
+
+ if dbCheck == 1:
+ dbName = items.split('-')[0]
+ status = open(backupPath + 'status', "w")
+ status.write(backupName + "\n")
+ status.write("Backing up database: " + dbName)
+ status.close()
+ mysqlUtilities.mysqlUtilities.createDatabaseBackup(dbName, tempStoragePath)
+
make_archive(backupPath+"/"+backupName, 'gztar', tempStoragePath)
rmtree(tempStoragePath)
@@ -122,7 +129,7 @@ class backupUtilities:
try:
finalData = json.dumps({'backupFile': backupName,"dir":dir})
- r = requests.post("http://localhost:5003/websites/CreateWebsiteFromBackup", data=finalData)
+ r = requests.post("http://localhost:5003/websites/CreateWebsiteFromBackup", data=finalData,verify=False)
data = json.loads(r.text)
if data['createWebSiteStatus'] == 1:
@@ -140,9 +147,6 @@ class backupUtilities:
logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [startRestore]")
return 0
-
-
-
f = open(completPath + '/status')
data = f.read()
status = data.split('\n', 1)[0]
@@ -152,23 +156,80 @@ class backupUtilities:
elif (status == "Website already exists"):
return 0
- ## reading meta file to create databases
+ ########### creating sub/addon/parked domains
+
+ status = open(completPath + '/status', "w")
+ status.write("Creating Child Domains")
+ status.close()
+
+ ## reading meta file to create subdomains
+
+ data = open(completPath + "/meta", 'r').readlines()
+
+ ## extracting master domain for later use
+
+ masterDomain = data[0].split('-')[0]
+ websiteHome = "/home/" + masterDomain + "/public_html"
+
+
+ try:
+ childDomainsCheck = 0
+ for items in data:
+ if items.find("Child Domains") > -1:
+ childDomainsCheck = 1
+ continue
+ if items.find("Databases") > -1:
+ break
+
+ if childDomainsCheck == 1:
+ domain = items.split('-')[0]
+ phpSelection = items.split('-')[1]
+ path = items.split('-')[2].strip("\n")
+
+
+ finalData = json.dumps({'masterDomain': masterDomain, 'domainName': domain,'phpSelection': phpSelection,'path': path,'ssl':0,'restore':1})
+ r = requests.post("http://localhost:5003/websites/submitDomainCreation", data=finalData,
+ verify=False)
+
+ data = json.loads(r.text)
+
+ if data['createWebSiteStatus'] == 1:
+ rmtree(path)
+ continue
+ else:
+ status = open(completPath + '/status', "w")
+ status.write("Not able to create Account and databases, aborting.")
+ status.close()
+ logging.CyberCPLogFileWriter.writeToFile(r.text)
+ return 0
+
+
+ except BaseException, msg:
+ status = open(completPath + '/status', "w")
+ status.write("[201] Not able to create Account and databases, aborting.")
+ status.close()
+ logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [startRestore]")
+ return 0
+
+
+
+
+ ## restoring databases
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()
+ dbCheck = 0
+
for items in data:
- if check == 0:
- check = check + 1
+ if items.find("Databases") > -1:
+ dbCheck = 1
continue
- else:
+ if dbCheck == 1:
dbData = items.split('-')
mysqlUtilities.mysqlUtilities.restoreDatabaseBackup(dbData[0], completPath, dbData[2].strip('\n'))
@@ -338,13 +399,16 @@ class backupUtilities:
else:
return 0
except BaseException, msg:
- logging.CyberCPLogFileWriter.writeToFile(str(msg) + "[checkIfPostIsUp]")
+ logging.CyberCPLogFileWriter.writeToFile(str(msg) + "[checkIfHostIsUp]")
@staticmethod
def checkConnection(IPAddress):
+
try:
+ backupUtilities.verifyHostKey(IPAddress)
+
expectation = []
expectation.append("password:")
expectation.append("Last login")
@@ -355,44 +419,90 @@ class backupUtilities:
if index == 0:
subprocess.call(['kill', str(checkConn.pid)])
- return 0
+ return [0,"Remote Server is not able to authenticate for transfer to initiate."]
elif index == 1:
subprocess.call(['kill', str(checkConn.pid)])
- return 1
+ return [1, "None"]
else:
subprocess.call(['kill', str(checkConn.pid)])
- return 0
+ return [0, "Remote Server is not able to authenticate for transfer to initiate."]
except pexpect.TIMEOUT, msg:
- logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [checkConnection]")
- return 0
+ logging.CyberCPLogFileWriter.writeToFile("Timeout "+IPAddress+ " [checkConnection]")
+ return [0, "371 Timeout while making connection to this server [checkConnection]"]
except pexpect.EOF, msg:
- logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [checkConnection]")
- return 0
+ logging.CyberCPLogFileWriter.writeToFile("EOF "+IPAddress+ "[checkConnection]")
+ return [0, "374 Remote Server is not able to authenticate for transfer to initiate. [checkConnection]"]
except BaseException, msg:
- logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [checkConnection]")
- return 0
+ logging.CyberCPLogFileWriter.writeToFile(str(msg)+" " +IPAddress+ " [checkConnection]")
+ return [0, "377 Remote Server is not able to authenticate for transfer to initiate. [checkConnection]"]
@staticmethod
def verifyHostKey(IPAddress):
-
try:
+ backupUtilities.host_key_verification(IPAddress)
- expectation = "continue connecting (yes/no)?"
+ password = "hello" ## dumb password, not used anywhere.
+
+ expectation = []
+
+ expectation.append("continue connecting (yes/no)?")
+ expectation.append("password:")
+
+ setupSSHKeys = pexpect.spawn("ssh root@" + IPAddress)
+
+ index = setupSSHKeys.expect(expectation)
+
+ if index == 0:
+ setupSSHKeys.sendline("yes")
+
+ setupSSHKeys.expect("password:")
+ setupSSHKeys.sendline(password)
+
+ expectation = []
+
+ expectation.append("password:")
+ expectation.append(pexpect.EOF)
+
+
+ innerIndex = setupSSHKeys.expect(expectation)
+
+ if innerIndex == 0:
+ setupSSHKeys.kill(signal.SIGTERM)
+ return [1, "None"]
+ elif innerIndex == 1:
+ setupSSHKeys.kill(signal.SIGTERM)
+ return [1, "None"]
+
+ elif index == 1:
+
+ setupSSHKeys.expect("password:")
+ setupSSHKeys.sendline(password)
+
+ expectation = []
+
+ expectation.append("password:")
+ expectation.append(pexpect.EOF)
+
+ innerIndex = setupSSHKeys.expect(expectation)
+
+ if innerIndex == 0:
+ setupSSHKeys.kill(signal.SIGTERM)
+ return [1, "None"]
+ elif innerIndex == 1:
+ setupSSHKeys.kill(signal.SIGTERM)
+ return [1, "None"]
- verifyHostKey = pexpect.spawn("ssh -i /root/.ssh/cyberpanel root@" + IPAddress, timeout=3)
- verifyHostKey.expect(expectation)
- verifyHostKey.sendline("yes")
except pexpect.TIMEOUT, msg:
logging.CyberCPLogFileWriter.writeToFile("Timeout [verifyHostKey]")
- return 0
+ return [0,"Timeout [verifyHostKey]"]
except pexpect.EOF, msg:
logging.CyberCPLogFileWriter.writeToFile("EOF [verifyHostKey]")
- return 0
+ return [0,"EOF [verifyHostKey]"]
except BaseException, msg:
logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [verifyHostKey]")
- return 0
+ return [0,str(msg)+" [verifyHostKey]"]
@staticmethod
diff --git a/plogical/remoteBackup.py b/plogical/remoteBackup.py
index d10c603ab..7af55e95d 100644
--- a/plogical/remoteBackup.py
+++ b/plogical/remoteBackup.py
@@ -197,87 +197,88 @@ class remoteBackup:
for backup in os.listdir(backupDir):
- writeToFile = open(backupLogPath, "a")
-
- writeToFile.writelines("\n")
- writeToFile.writelines("\n")
- writeToFile.writelines("[" + time.strftime(
- "%I-%M-%S-%a-%b-%Y") + "]" + " Starting restore for: "+backup+".\n")
-
- writeToFile.close()
-
if backup.endswith(ext):
- finalData = json.dumps({'backupFile': backup,"dir":dir})
- r = requests.post("http://localhost:5003/backup/submitRestore", data=finalData)
- data = json.loads(r.text)
+ writeToFile = open(backupLogPath, "a")
- if data['restoreStatus'] == 1:
+ writeToFile.writelines("\n")
+ writeToFile.writelines("\n")
+ writeToFile.writelines("[" + time.strftime(
+ "%I-%M-%S-%a-%b-%Y") + "]" + " Starting restore for: "+backup+".\n")
- while (1):
- finalData = json.dumps({'backupFile': backup, "dir": dir})
- r = requests.post("http://localhost:5003/backup/restoreStatus", data=finalData)
- data = json.loads(r.text)
+ writeToFile.close()
- logging.CyberCPLogFileWriter.writeToFile(r.text)
+ if backup.endswith(ext):
+ finalData = json.dumps({'backupFile': backup,"dir":dir})
+ r = requests.post("http://localhost:5003/backup/submitRestore", data=finalData,verify=False)
+ data = json.loads(r.text)
- if data['status'] == "Done":
- writeToFile = open(backupLogPath, "a")
- writeToFile.writelines("\n")
- writeToFile.writelines("\n")
- writeToFile.writelines("[" + time.strftime(
- "%I-%M-%S-%a-%b-%Y") + "]" + " Restore Completed.\n")
- writeToFile.writelines("[" + time.strftime(
- "%I-%M-%S-%a-%b-%Y") + "]" + " #########################################\n")
- writeToFile.close()
- break
- elif data['status'] == "Website already exists":
- writeToFile = open(backupLogPath, "a")
- writeToFile.writelines("\n")
- writeToFile.writelines("\n")
- writeToFile.writelines("[" + time.strftime(
- "%I-%M-%S-%a-%b-%Y") + "]" + " Website associated with this backup already exists.\n")
- writeToFile.writelines("[" + time.strftime(
- "%I-%M-%S-%a-%b-%Y") + "]" + " #########################################\n")
- writeToFile.close()
- logging.CyberCPLogFileWriter.writeToFile(
- "Website associated with this backup already exists")
- break
- elif data['status'] == 0:
- time.sleep(2)
+ if data['restoreStatus'] == 1:
- writeToFile = open(backupLogPath, "a")
- writeToFile.writelines("\n")
- writeToFile.writelines("\n")
- writeToFile.writelines("[" + time.strftime(
- "%I-%M-%S-%a-%b-%Y") + "]" + " Waiting for restore to complete.\n")
- writeToFile.close()
+ while (1):
+ finalData = json.dumps({'backupFile': backup, "dir": dir})
+ r = requests.post("http://localhost:5003/backup/restoreStatus", data=finalData,verify=False)
+ data = json.loads(r.text)
- pass
- elif data['status'] == "Not able to create Account and databases, aborting.":
- writeToFile = open(backupLogPath, "a")
- writeToFile.writelines("\n")
- writeToFile.writelines("\n")
- writeToFile.writelines("[" + time.strftime(
- "%I-%M-%S-%a-%b-%Y") + "]" + " Not able to create Account and databases, aborting.\n")
- writeToFile.writelines("[" + time.strftime(
- "%I-%M-%S-%a-%b-%Y") + "]" + " #########################################\n")
- writeToFile.close()
- logging.CyberCPLogFileWriter.writeToFile(
- "Not able to create Account and databases, aborting.")
- break
- else:
- time.sleep(3)
+ logging.CyberCPLogFileWriter.writeToFile(r.text)
- writeToFile = open(backupLogPath, "a")
- writeToFile.writelines("\n")
- writeToFile.writelines("\n")
- writeToFile.writelines("[" + time.strftime(
- "%I-%M-%S-%a-%b-%Y") + "]" + " Waiting for restore to complete.\n")
- writeToFile.close()
+ if data['status'] == "Done":
+ writeToFile = open(backupLogPath, "a")
+ writeToFile.writelines("\n")
+ writeToFile.writelines("\n")
+ writeToFile.writelines("[" + time.strftime(
+ "%I-%M-%S-%a-%b-%Y") + "]" + " Restore Completed.\n")
+ writeToFile.writelines("[" + time.strftime(
+ "%I-%M-%S-%a-%b-%Y") + "]" + " #########################################\n")
+ writeToFile.close()
+ break
+ elif data['status'] == "Website already exists":
+ writeToFile = open(backupLogPath, "a")
+ writeToFile.writelines("\n")
+ writeToFile.writelines("\n")
+ writeToFile.writelines("[" + time.strftime(
+ "%I-%M-%S-%a-%b-%Y") + "]" + " Website associated with this backup already exists.\n")
+ writeToFile.writelines("[" + time.strftime(
+ "%I-%M-%S-%a-%b-%Y") + "]" + " #########################################\n")
+ writeToFile.close()
+ logging.CyberCPLogFileWriter.writeToFile(
+ "Website associated with this backup already exists")
+ break
+ elif data['status'] == 0:
+ time.sleep(2)
- pass
- else:
- logging.CyberCPLogFileWriter.writeToFile("Could not start restore process for: "+backup)
+ writeToFile = open(backupLogPath, "a")
+ writeToFile.writelines("\n")
+ writeToFile.writelines("\n")
+ writeToFile.writelines("[" + time.strftime(
+ "%I-%M-%S-%a-%b-%Y") + "]" + " Waiting for restore to complete.\n")
+ writeToFile.close()
+
+ pass
+ elif data['status'] == "Not able to create Account and databases, aborting.":
+ writeToFile = open(backupLogPath, "a")
+ writeToFile.writelines("\n")
+ writeToFile.writelines("\n")
+ writeToFile.writelines("[" + time.strftime(
+ "%I-%M-%S-%a-%b-%Y") + "]" + " Not able to create Account and databases, aborting.\n")
+ writeToFile.writelines("[" + time.strftime(
+ "%I-%M-%S-%a-%b-%Y") + "]" + " #########################################\n")
+ writeToFile.close()
+ logging.CyberCPLogFileWriter.writeToFile(
+ "Not able to create Account and databases, aborting.")
+ break
+ else:
+ time.sleep(3)
+
+ writeToFile = open(backupLogPath, "a")
+ writeToFile.writelines("\n")
+ writeToFile.writelines("\n")
+ writeToFile.writelines("[" + time.strftime(
+ "%I-%M-%S-%a-%b-%Y") + "]" + " Waiting for restore to complete.\n")
+ writeToFile.close()
+
+ pass
+ else:
+ logging.CyberCPLogFileWriter.writeToFile("Could not start restore process for: "+backup)
writeToFile = open(backupLogPath, "a")
@@ -360,13 +361,13 @@ class remoteBackup:
"%I-%M-%S-%a-%b-%Y") + "]" + " Backup started for: " + virtualHost + "\n")
finalData = json.dumps({'websiteToBeBacked': virtualHost})
- r = requests.post("http://localhost:5003/backup/submitBackupCreation", data=finalData)
+ r = requests.post("http://localhost:5003/backup/submitBackupCreation", data=finalData,verify=False)
data = json.loads(r.text)
backupPath = data['tempStorage']
while (1):
- r = requests.post("http://localhost:5003/backup/backupStatus", data= finalData)
+ r = requests.post("http://localhost:5003/backup/backupStatus", data= finalData,verify=False)
time.sleep(2)
data = json.loads(r.text)
@@ -428,7 +429,7 @@ class remoteBackup:
finalData = json.dumps({'websiteToBeBacked': virtualHost})
- r = requests.post("http://localhost:5003/backup/submitBackupCreation", data=finalData)
+ r = requests.post("http://localhost:5003/backup/submitBackupCreation", data=finalData,verify=False)
data = json.loads(r.text)
@@ -438,7 +439,7 @@ class remoteBackup:
while (1):
- r = requests.post("http://localhost:5003/backup/backupStatus", data= finalData)
+ r = requests.post("http://localhost:5003/backup/backupStatus", data= finalData,verify=False)
time.sleep(2)
data = json.loads(r.text)
@@ -513,18 +514,25 @@ class remoteBackup:
writeToFile.writelines("\n")
writeToFile.writelines("\n")
- writeToFile.close()
## fix yes/no
- backupUtil.backupUtilities.verifyHostKey(ipAddress)
+ verify = backupUtil.backupUtilities.verifyHostKey(ipAddress)
+
+ ## if verification failed, return with error message
+
+ if verify[0] == 1:
+ pass
+ else:
+ return [0,verify[1]]
if backupUtil.backupUtilities.checkIfHostIsUp(ipAddress) == 1:
- if backupUtil.backupUtilities.checkConnection(ipAddress) != 1:
+ checkConn = backupUtil.backupUtilities.checkConnection(ipAddress)
+ if checkConn[0] == 0:
writeToFile.writelines("[" + time.strftime(
"%I-%M-%S-%a-%b-%Y") + "]" + " Connection to:" + ipAddress + " Failed, please resetup this destination from CyberPanel, aborting." + "\n")
- return [0, "Connection check failed"]
+ return [0, checkConn[1]]
else:
pass
else:
@@ -532,6 +540,8 @@ class remoteBackup:
"%I-%M-%S-%a-%b-%Y") + "]" + " Host:" + ipAddress + " is down, aborting." + "\n")
return [0, "Host is down"]
+ writeToFile.close()
+
p = Process(target=remoteBackup.backupProcess, args=(ipAddress, destination, backupLogPath,dir,accountsToTransfer))
p.start()
@@ -543,6 +553,6 @@ class remoteBackup:
return [1, None]
except BaseException, msg:
- logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [postRemoteTransfer]")
+ logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [remoteTransfer]")
return [0, msg]
diff --git a/plogical/sslUtilities.py b/plogical/sslUtilities.py
index 960a4ba22..8a7693c23 100644
--- a/plogical/sslUtilities.py
+++ b/plogical/sslUtilities.py
@@ -134,12 +134,10 @@ class sslUtilities:
@staticmethod
- def obtainSSLForADomain(virtualHostName,adminEmail):
+ def obtainSSLForADomain(virtualHostName,adminEmail,sslpath):
try:
- sslpath = "/home/" + virtualHostName + "/public_html"
-
#if virtualHostName.count(".")==1:
# command = "certbot certonly -n --agree-tos --email " + adminEmail + " --webroot -w " + sslpath + " -d " + virtualHostName + " -d www." + virtualHostName
#else:
diff --git a/plogical/test.py b/plogical/test.py
index 3feeef13a..6de77b8b9 100644
--- a/plogical/test.py
+++ b/plogical/test.py
@@ -1,29 +1,77 @@
import requests
import json
-def editWPFile():
+import pexpect
+from CyberCPLogFileWriter import CyberCPLogFileWriter as logging
+import time
+from backupUtilities import backupUtilities
+import signal
- finalData = json.dumps({'adminUser': "admin",
- 'adminPass': "1234567",
- 'domainName': "usmannasir.me",
- 'ownerEmail': "admin",
- 'packageName': "Default",
- 'websiteOwner': "usman",
- 'ownerPassword': "9xvps",
- })
- r = requests.post("http://147.135.165.44:8090/api/createWebsite", data=finalData)
- print r.text
+def verifyHostKey(IPAddress):
+ try:
+ backupUtilities.host_key_verification(IPAddress)
-def delwebsite():
+ password = "hello"
- finalData = json.dumps({'adminUser': "admin",
- 'adminPass': "9njZ9Hw6QuJvw4AS6w",
- })
- r = requests.post("https://cyberpanel.extravm.com:8090/api/verifyConn", data=finalData)
- print r.text
+ expectation = []
+
+ expectation.append("continue connecting (yes/no)?")
+ expectation.append("password:")
+
+ setupSSHKeys = pexpect.spawn("ssh root@" + IPAddress)
+
+ index = setupSSHKeys.expect(expectation)
+
+ if index == 0:
+ setupSSHKeys.sendline("yes")
+
+ setupSSHKeys.expect("password:")
+ setupSSHKeys.sendline(password)
+
+ expectation = []
+
+ expectation.append("password:")
+ expectation.append(pexpect.EOF)
-def getKey(ipAddress, password):
- return requests.get('https://api.ipify.org').text
+ innerIndex = setupSSHKeys.expect(expectation)
+
+ if innerIndex == 0:
+ setupSSHKeys.kill(signal.SIGTERM)
+ return [1, "None"]
+ elif innerIndex == 1:
+ setupSSHKeys.kill(signal.SIGTERM)
+ return [1, "None"]
+
+ elif index == 1:
+
+ setupSSHKeys.expect("password:")
+ setupSSHKeys.sendline(password)
+
+ expectation = []
+
+ expectation.append("password:")
+ expectation.append(pexpect.EOF)
+
+ innerIndex = setupSSHKeys.expect(expectation)
+
+ if innerIndex == 0:
+ setupSSHKeys.kill(signal.SIGTERM)
+ return [1, "None"]
+ elif innerIndex == 1:
+ setupSSHKeys.kill(signal.SIGTERM)
+ return [1, "None"]
-print getKey("147.135.165.44","1234567")
\ No newline at end of file
+ except pexpect.TIMEOUT, msg:
+ logging.writeToFile("Timeout [verifyHostKey]")
+ return [0,"Timeout [verifyHostKey]"]
+ except pexpect.EOF, msg:
+ logging.writeToFile("EOF [verifyHostKey]")
+ return [0,"EOF [verifyHostKey]"]
+ except BaseException, msg:
+ logging.writeToFile(str(msg) + " [verifyHostKey]")
+ return [0,str(msg)+" [verifyHostKey]"]
+
+
+
+print verifyHostKey("23.95.216.56")
\ No newline at end of file
diff --git a/plogical/virtualHostUtilities.py b/plogical/virtualHostUtilities.py
index ecefc73b1..154ed5faf 100644
--- a/plogical/virtualHostUtilities.py
+++ b/plogical/virtualHostUtilities.py
@@ -65,6 +65,106 @@ class virtualHostUtilities:
return 0
+ @staticmethod
+ def perHostVirtualConf(vhFile, administratorEmail, phpVersion):
+
+ # General Configurations tab
+
+ try:
+ confFile = open(vhFile, "w+")
+
+ docRoot = "docRoot $VH_ROOT/public_html" + "\n"
+ vhDomain = "vhDomain $VH_NAME" + "\n"
+ adminEmails = "adminEmails " + administratorEmail + "\n"
+ enableGzip = "enableGzip 1" + "\n"
+ enableIpGeo = "enableIpGeo 1" + "\n" + "\n"
+
+ confFile.writelines(docRoot)
+ confFile.writelines(vhDomain)
+ confFile.writelines(adminEmails)
+ confFile.writelines(enableGzip)
+ confFile.writelines(enableIpGeo)
+
+ # Index file settings
+
+ index = "index {" + "\n"
+ userServer = " useServer 0" + "\n"
+ indexFiles = " indexFiles index.php, index.html" + "\n"
+ index_end = "}" + "\n" + "\n"
+
+ confFile.writelines(index)
+ confFile.writelines(userServer)
+ confFile.writelines(indexFiles)
+ confFile.writelines(index_end)
+
+ # Error Log Settings
+
+
+ error_log = "errorlog $VH_ROOT/logs/$VH_NAME.error_log {" + "\n"
+ useServer = " useServer 0" + "\n"
+ logLevel = " logLevel ERROR" + "\n"
+ rollingSize = " rollingSize 10M" + "\n"
+ error_log_end = "}" + "\n" + "\n"
+
+ confFile.writelines(error_log)
+ confFile.writelines(useServer)
+ confFile.writelines(logLevel)
+ confFile.writelines(rollingSize)
+ confFile.writelines(error_log_end)
+
+ # Access Log Settings
+
+ access_Log = "accesslog $VH_ROOT/logs/$VH_NAME.access_log {" + "\n"
+ useServer = " useServer 0" + "\n"
+ logFormat = ' logFormat "%v %h %l %u %t \"%r\" %>s %b"' + "\n"
+ logHeaders = " logHeaders 5" + "\n"
+ rollingSize = " rollingSize 10M" + "\n"
+ keepDays = " keepDays 10"
+ compressArchive = " compressArchive 1" + "\n"
+ access_Log_end = "}" + "\n" + "\n"
+
+ confFile.writelines(access_Log)
+ confFile.writelines(useServer)
+ confFile.writelines(logFormat)
+ confFile.writelines(logHeaders)
+ confFile.writelines(rollingSize)
+ confFile.writelines(keepDays)
+ confFile.writelines(compressArchive)
+ confFile.writelines(access_Log_end)
+
+ # php settings
+
+ scripthandler = "scripthandler {" + "\n"
+ add = ""
+ php_end = "}" + "\n" + "\n"
+
+ if phpVersion == "PHP 5.3":
+ add = " add lsapi:php53 php" + "\n"
+ elif phpVersion == "PHP 5.4":
+ add = " add lsapi:php54 php" + "\n"
+ elif phpVersion == "PHP 5.5":
+ add = " add lsapi:php55 php" + "\n"
+ elif phpVersion == "PHP 5.6":
+ add = " add lsapi:php56 php" + "\n"
+ elif phpVersion == "PHP 7.0":
+ add = " add lsapi:php70 php" + "\n"
+ elif phpVersion == "PHP 7.1":
+ add = " add lsapi:php71 php" + "\n"
+
+ confFile.writelines(scripthandler)
+ confFile.writelines(add)
+ confFile.writelines(php_end)
+
+ confFile.close()
+
+ except BaseException, msg:
+ logging.CyberCPLogFileWriter.writeToFile(
+ str(msg) + " [IO Error with per host config file [perHostVirtualConf]]")
+ return 0
+ return 1
+
+
+
@staticmethod
def createConfigInMainVirtualHostFile(virtualHostName):
@@ -127,18 +227,70 @@ class virtualHostUtilities:
return 0
return 1
+ @staticmethod
+ def createDirectoryForDomain(masterDomain, domain, phpVersion, path, administratorEmail):
+
+ confPath = virtualHostUtilities.Server_root + "/conf/vhosts/" + domain
+ completePathToConfigFile = confPath + "/vhost.conf"
+
+ try:
+ os.makedirs(path)
+ except OSError, msg:
+ logging.CyberCPLogFileWriter.writeToFile(
+ str(msg) + " [Not able to directories for virtual host [createDirectoryForDomain]]")
+
+ try:
+ os.makedirs(confPath)
+ except OSError, msg:
+ logging.CyberCPLogFileWriter.writeToFile(
+ str(msg) + " [Not able to directories for virtual host [createDirectoryForDomain]]")
+
+ try:
+ file = open(completePathToConfigFile, "w+")
+ except IOError, msg:
+ logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [createDirectoryForDomain]]")
+ return 0
+
+ try:
+ uid = pwd.getpwnam("lsadm").pw_uid
+ gid = grp.getgrnam("lsadm").gr_gid
+ os.chown(confPath, uid, gid)
+ os.chown(completePathToConfigFile, uid, gid)
+
+ uid = pwd.getpwnam("nobody").pw_uid
+ gid = grp.getgrnam("nobody").gr_gid
+
+ os.chown("/home", uid, gid)
+ os.chown(path, uid, gid)
+
+ except BaseException, msg:
+ logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [createDirectoryForDomain]]")
+
+ if virtualHostUtilities.perHostDomainConf(path, masterDomain, domain, completePathToConfigFile,
+ administratorEmail, phpVersion) == 1:
+ return 1
+ else:
+ return 0
@staticmethod
- def perHostVirtualConf(vhFile,administratorEmail, phpVersion):
+ def perHostDomainConf(path, masterDomain, domain, vhFile, administratorEmail, phpVersion):
# General Configurations tab
+ # virtualhost project.cyberpersons.com {
+ # vhRoot / home / project.cyberpersons.com
+ # configFile $SERVER_ROOT / conf / vhosts /$VH_NAME / vhconf.conf
+ # allowSymbolLink 1
+ # enableScript 1
+ # restrained 1
+ # }
+
try:
confFile = open(vhFile, "w+")
- docRoot = "docRoot $VH_ROOT/public_html" + "\n"
+ docRoot = "docRoot " + path + "\n"
vhDomain = "vhDomain $VH_NAME" + "\n"
- adminEmails = "adminEmails "+ administratorEmail + "\n"
+ adminEmails = "adminEmails " + administratorEmail + "\n"
enableGzip = "enableGzip 1" + "\n"
enableIpGeo = "enableIpGeo 1" + "\n" + "\n"
@@ -148,11 +300,10 @@ class virtualHostUtilities:
confFile.writelines(enableGzip)
confFile.writelines(enableIpGeo)
-
# Index file settings
index = "index {" + "\n"
- userServer= " useServer 0" + "\n"
+ userServer = " useServer 0" + "\n"
indexFiles = " indexFiles index.php, index.html" + "\n"
index_end = "}" + "\n" + "\n"
@@ -164,7 +315,7 @@ class virtualHostUtilities:
# Error Log Settings
- error_log = "errorlog $VH_ROOT/logs/$VH_NAME.error_log {" + "\n"
+ error_log = "errorlog $VH_ROOT/logs/" + masterDomain + ".error_log {" + "\n"
useServer = " useServer 0" + "\n"
logLevel = " logLevel ERROR" + "\n"
rollingSize = " rollingSize 10M" + "\n"
@@ -176,18 +327,16 @@ class virtualHostUtilities:
confFile.writelines(rollingSize)
confFile.writelines(error_log_end)
-
-
# Access Log Settings
- access_Log = "accesslog $VH_ROOT/logs/$VH_NAME.access_log {" + "\n"
- useServer=" useServer 0" + "\n"
- logFormat=' logFormat "%v %h %l %u %t \"%r\" %>s %b"' + "\n"
- logHeaders=" logHeaders 5" + "\n"
- rollingSize=" rollingSize 10M" + "\n"
- keepDays=" keepDays 10"
- compressArchive=" compressArchive 1" + "\n"
- access_Log_end= "}" + "\n" + "\n"
+ access_Log = "accesslog $VH_ROOT/logs/" + masterDomain + ".access_log {" + "\n"
+ useServer = " useServer 0" + "\n"
+ logFormat = ' logFormat "%v %h %l %u %t \"%r\" %>s %b"' + "\n"
+ logHeaders = " logHeaders 5" + "\n"
+ rollingSize = " rollingSize 10M" + "\n"
+ keepDays = " keepDays 10"
+ compressArchive = " compressArchive 1" + "\n"
+ access_Log_end = "}" + "\n" + "\n"
confFile.writelines(access_Log)
confFile.writelines(useServer)
@@ -198,17 +347,12 @@ class virtualHostUtilities:
confFile.writelines(compressArchive)
confFile.writelines(access_Log_end)
-
-
-
-
# php settings
scripthandler = "scripthandler {" + "\n"
add = ""
php_end = "}" + "\n" + "\n"
-
if phpVersion == "PHP 5.3":
add = " add lsapi:php53 php" + "\n"
elif phpVersion == "PHP 5.4":
@@ -226,16 +370,74 @@ class virtualHostUtilities:
confFile.writelines(add)
confFile.writelines(php_end)
-
confFile.close()
- except BaseException,msg:
- logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [IO Error with per host config file [perHostVirtualConf]]")
+ except BaseException, msg:
+ logging.CyberCPLogFileWriter.writeToFile(
+ str(msg) + " [IO Error with per host config file [perHostDomainConf]]")
return 0
return 1
+ @staticmethod
+ def createConfigInMainDomainHostFile(domain,masterDomain):
+ # virtualhost project.cyberpersons.com {
+ # vhRoot / home / project.cyberpersons.com
+ # configFile $SERVER_ROOT / conf / vhosts /$VH_NAME / vhconf.conf
+ # allowSymbolLink 1
+ # enableScript 1
+ # restrained 1
+ # }
+ try:
+ data = open("/usr/local/lsws/conf/httpd_config.conf").readlines()
+ writeDataToFile = open("/usr/local/lsws/conf/httpd_config.conf", 'w')
+
+ spaceonback = " "
+ space = " "
+ space2 = " "
+ space3 = " "
+ space4 = " "
+ space5 = " "
+
+ firstLine = "virtualHost " + domain + " {" + "\n"
+ secondLine = spaceonback + "vhRoot" + space + "/home/" + masterDomain + "\n"
+ thirdLine = spaceonback + "configFile" + space2 + "$SERVER_ROOT" + "/conf/" + "vhosts/" + "$VH_NAME" + "/vhost.conf" + "\n"
+ forthLine = spaceonback + "allowSymbolLink" + space3 + "1" + "\n"
+ fifthLine = spaceonback + "enableScript" + space4 + "1" + "\n"
+ sixthLine = spaceonback + "restrained" + space5 + "1" + "\n"
+ seventhLine = "}" + "\n"
+ map = " map " + domain + " " + domain + "\n"
+
+ checker = 1
+ mapchecker = 1
+
+ for items in data:
+ if ((items.find("virtualHost") > -1 or items.find("virtualhost") > -1) and checker == 1):
+ writeDataToFile.writelines(firstLine)
+ writeDataToFile.writelines(secondLine)
+ writeDataToFile.writelines(thirdLine)
+ writeDataToFile.writelines(forthLine)
+ writeDataToFile.writelines(fifthLine)
+ writeDataToFile.writelines(sixthLine)
+ writeDataToFile.writelines(seventhLine)
+ writeDataToFile.writelines("\n")
+ writeDataToFile.writelines(items)
+ checker = 0
+ elif ((items.find("listener Default{") > -1 or items.find("Default {") > -1) and mapchecker == 1):
+ writeDataToFile.writelines(items)
+ writeDataToFile.writelines(map)
+ mapchecker = 0
+
+ else:
+ writeDataToFile.writelines(items)
+
+ writeDataToFile.close()
+ except BaseException, msg:
+ logging.CyberCPLogFileWriter.writeToFile(
+ str(msg) + " [IO Error with main config file [createConfigInMainVirtualHostFile]]")
+ return 0
+ return 1
@staticmethod
def deleteVirtualHostConfigurations(virtualHostName,numberOfSites):
@@ -338,7 +540,6 @@ class virtualHostUtilities:
return 1
-
@staticmethod
def getDiskUsage(path, totalAllowed):
try:
diff --git a/static/backup/backup.js b/static/backup/backup.js
index ab4e2b27a..ae8c7cef4 100644
--- a/static/backup/backup.js
+++ b/static/backup/backup.js
@@ -396,7 +396,6 @@ app.controller('restoreWebsiteControl', function($scope,$http,$timeout) {
};
-
$scope.restoreBackup = function(){
var backupFile = $scope.backupFile;
@@ -1033,102 +1032,97 @@ app.controller('scheduleBackup', function($scope,$http,$timeout) {
//*** Remote Backup site ****//
app.controller('remoteBackupControl', function($scope, $http, $timeout) {
+
$scope.backupButton = true;
-
- $scope.status_success = true;
- $scope.status_danger = true;
- $scope.status_info = true;
-
$scope.backupLoading = true;
$scope.request = true;
$scope.requestData = "";
$scope.submitDisable = false;
$scope.startRestore = true;
+ $scope.accountsInRemoteServerTable = true;
+ $scope.transferBoxBtn = true;
+ $scope.stopTransferbtn = true;
+ $scope.fetchAccountsBtn = false;
+
+
+ // notifications boxes
+ $scope.notificationsBox = true;
+ $scope.errorMessage = true;
+ $scope.couldNotConnect = true;
+ $scope.accountsFetched = true;
+ $scope.backupProcessStarted = true;
+ $scope.backupCancelled = true;
+
+ // status box
+
+ $scope.backupStatus = true;
+
+ var websitesToBeBacked = [];
+ var websitesToBeBackedTemp = [];
+
+ var index = 0;
+ var tempTransferDir = "";
+
$scope.passwordEnter = function() {
$scope.backupButton = false;
};
- var seek = 0;
- var backupDir;
- var username = "admin";
-
-
-
- function getBackupStatus(password) {
-
- url = "/backup/getRemoteTransferStatus";
-
- var data = {
- ipAddress: $scope.IPAddress,
- seek: seek,
- backupDir: backupDir,
- };
-
- var config = {
- headers: {
- 'X-CSRFToken': getCookie('csrftoken')
- }
- };
-
-
- console.log("Initiating Status with seek: " + seek)
-
- $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas);
-
- function ListInitialDatas(response) {
- console.log(response.data)
-
- if (response.data.remoteTransferStatus == 1) {
- seek = response.data.where;
- if (response.data.complete == 1) {
- $scope.submitDisable = false;
- $scope.backupLoading = true;
-
- $scope.status_danger = true;
- $scope.status_info = true;
- $scope.status_success = false;
- $scope.startRestore = true;
- $scope.statusBox = "Backup Files Transferred! Require Permission to restore backups";
- $scope.requestData = $scope.requestData + response.data.logs
- seek = 0;
-
- $scope.startRestore = false;
- } else {
- $scope.requestData = $scope.requestData + response.data.logs
- $timeout(getBackupStatus(password), 5000);
+ $scope.addRemoveWebsite = function (website,websiteStatus) {
+ if(websiteStatus==true)
+ {
+ var check = 1;
+ for(var j = 0; j < websitesToBeBacked.length; j++){
+ if (websitesToBeBacked[j] == website){
+ check = 0;
+ break;
+ }
}
- } else {
- if (response.data.error_message == "list index out of range") {
- $timeout(getBackupStatus(password), 5000);
- } else {
- $scope.submitDisable = false;
- $scope.status_danger = false;
- $scope.status_info = true;
- $scope.status_success = true;
- $scope.statusBox = "Unable to Transfer File: " + response.data.error_message;
- }
-
+ if(check == 1) {
+ websitesToBeBacked.push(website);
}
}
+ else{
- function cantLoadInitialDatas(response) {
- $scope.status_danger = false;
- $scope.status_info = true;
- $scope.status_success = true;
- $scope.statusBox = "Unable to connect"
+ var tempArray = [];
+
+ for(var j = 0; j < websitesToBeBacked.length; j++){
+ if (websitesToBeBacked[j] != website){
+ tempArray.push(websitesToBeBacked[j]);
+ }
+ }
+ websitesToBeBacked = tempArray;
}
};
- $scope.submitRemoteBackup = function() {
- $scope.requestData = "";
- $scope.status_success = true;
- $scope.status_danger = true;
- $scope.status_info = true;
+ $scope.allChecked = function (webSiteStatus) {
+
+
+
+ if(webSiteStatus==true) {
+
+ websitesToBeBacked = websitesToBeBackedTemp;
+ $scope.webSiteStatus = true;
+ }
+ else{
+ websitesToBeBacked = [];
+ $scope.webSiteStatus = false;
+ }
+ };
+
+ $scope.fetchAccountsFromRemoteServer = function () {
$scope.backupLoading = false;
- $scope.submitDisable = true;
+
+ // notifications boxes
+ $scope.notificationsBox = true;
+ $scope.errorMessage = true;
+ $scope.couldNotConnect = true;
+ $scope.accountsFetched = true;
+ $scope.backupProcessStarted = true;
+ $scope.backupCancelled = true;
+
var IPAddress = $scope.IPAddress;
var password = $scope.password;
@@ -1136,7 +1130,6 @@ app.controller('remoteBackupControl', function($scope, $http, $timeout) {
var data = {
ipAddress: IPAddress,
- username: username,
password: password,
};
@@ -1147,48 +1140,96 @@ app.controller('remoteBackupControl', function($scope, $http, $timeout) {
};
-
$http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas);
-
function ListInitialDatas(response) {
- console.log(response.data)
if (response.data.status == 1) {
- $scope.request = false;
- console.log("Backup generated!!")
- backupDir = response.data.dir;
- getBackupStatus(password);
- } else {
- $scope.submitDisable = false;
+ $scope.records = JSON.parse(response.data.data);
+ var parsed = JSON.parse(response.data.data);
+
+ for(var j = 0; j < parsed.length; j++){
+ websitesToBeBackedTemp.push(parsed[j].website);
+ }
+
+ $scope.accountsInRemoteServerTable = false;
$scope.backupLoading = true;
- $scope.status_danger = false;
- $scope.status_info = true;
- $scope.status_success = true;
- $scope.statusBox = "Unable to Transfer File: " + response.data.error_message;
+ // enable the transfer/cancel btn
+
+ $scope.transferBoxBtn = false;
+
+ // notifications boxes
+ $scope.notificationsBox = false;
+ $scope.errorMessage = true;
+ $scope.couldNotConnect = true;
+ $scope.accountsFetched = false;
+ $scope.backupProcessStarted = true;
+ $scope.backupCancelled = true;
+
+
+ }
+ else {
+ $scope.error_message = response.data.error_message;
+ $scope.backupLoading = true;
+
+ // notifications boxes
+ $scope.notificationsBox = false;
+ $scope.errorMessage = false;
+ $scope.couldNotConnect = true;
+ $scope.accountsFetched = true;
+ $scope.backupProcessStarted = true;
+ $scope.backupCancelled = true;
}
}
function cantLoadInitialDatas(response) {
- $scope.status_danger = false;
- $scope.status_info = true;
- $scope.status_success = true;
- $scope.statusBox = "Unable to connect"
+
+ // notifications boxes
+
+ $scope.notificationsBox = false;
+ $scope.errorMessage = true;
+ $scope.couldNotConnect = false;
+ $scope.accountsFetched = true;
+ $scope.backupProcessStarted = true;
+ $scope.backupCancelled = true;
+
}
};
+
+ $scope.startTransfer = function () {
- function getRestStatus() {
+ // notifications boxes
+ $scope.notificationsBox = true;
+ $scope.errorMessage = true;
+ $scope.couldNotConnect = true;
+ $scope.accountsFetched = true;
+ $scope.backupProcessStarted = true;
+ $scope.backupCancelled = true;
- url = "/backup/remoteRestoreStatus";
+
+
+ if(websitesToBeBacked.length === 0){
+ alert("No websites selected for transfer.")
+ return;
+ }
+
+ $scope.fetchAccountsBtn = true;
+
+ $scope.backupLoading = false;
+
+ var IPAddress = $scope.IPAddress;
+ var password = $scope.password;
+
+ url = "/backup/starRemoteTransfer";
var data = {
- seek: seek,
- backupDir: backupDir,
+ ipAddress: IPAddress,
+ password: password,
+ accountsToTransfer:websitesToBeBacked,
};
- console.log(data)
var config = {
headers: {
@@ -1197,69 +1238,142 @@ app.controller('remoteBackupControl', function($scope, $http, $timeout) {
};
- console.log("Initiating Status with seek: " + seek)
-
$http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas);
function ListInitialDatas(response) {
- console.log(response.data)
- if (response.data.remoteRestoreStatus == 1) {
- seek = response.data.where;
- console.log(seek);
- if (response.data.complete == 1) {
- $scope.submitDisable = false;
- $scope.backupLoading = true;
+ if (response.data.remoteTransferStatus == 1) {
+ tempTransferDir = response.data.dir;
+ $scope.accountsInRemoteServerTable = true;
- $scope.status_danger = true;
- $scope.status_info = true;
- $scope.status_success = false;
+ // notifications boxes
+ $scope.notificationsBox = false;
+ $scope.errorMessage = true;
+ $scope.couldNotConnect = true;
+ $scope.accountsFetched = true;
+ $scope.backupProcessStarted = false;
+ $scope.backupCancelled = true;
- $scope.statusBox = "Backup Files Restored!";
- $scope.requestData = $scope.requestData + response.data.logs
- $scope.startRestore = false;
- } else {
- $scope.requestData = $scope.requestData + response.data.logs
- $timeout(getRestStatus(), 5000);
- }
- } else {
- if (response.data.error_message == "list index out of range") {
- $timeout(getRestStatus(), 5000);
- } else {
- $scope.submitDisable = false;
- $scope.status_danger = false;
- $scope.status_info = true;
- $scope.status_success = true;
- $scope.statusBox = "Unable to Restore File: " + response.data.error_message;
- }
+ // disable transfer button
+
+ $scope.startTransferbtn = true;
+
+
+ // enable cancel button
+
+ $scope.stopTransferbtn = false;
+
+
+ getBackupStatus();
+
+
+ }
+ else {
+
+ $scope.error_message = response.data.error_message;
+ $scope.backupLoading = true;
+
+ // Notifications box settings
+
+ // notifications boxes
+ $scope.notificationsBox = false;
+ $scope.errorMessage = false;
+ $scope.couldNotConnect = true;
+ $scope.accountsFetched = true;
+ $scope.backupProcessStarted = true;
+ $scope.backupCancelled = true;
}
}
function cantLoadInitialDatas(response) {
- $scope.status_danger = false;
- $scope.status_info = true;
- $scope.status_success = true;
- $scope.statusBox = "Unable to connect"
+
+ // Notifications box settings
+
+ // notifications boxes
+ $scope.notificationsBox = false;
+ $scope.errorMessage = true;
+ $scope.couldNotConnect = false;
+ $scope.accountsFetched = true;
+ $scope.backupProcessStarted = true;
+ $scope.backupCancelled = true;
+
+ }
+
+ };
+
+
+
+ function getBackupStatus(password) {
+
+ url = "/backup/getRemoteTransferStatus";
+
+ var data = {
+ password : $scope.password,
+ ipAddress: $scope.IPAddress,
+ dir: tempTransferDir,
+ };
+
+ var config = {
+ headers: {
+ 'X-CSRFToken': getCookie('csrftoken')
+ }
+ };
+
+
+ $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas);
+
+ function ListInitialDatas(response) {
+
+ if (response.data.remoteTransferStatus == 1) {
+
+ if(response.data.backupsSent == 0){
+ $scope.backupStatus = false;
+ $scope.requestData = response.data.status;
+ $timeout(getBackupStatus, 2000);
+ }
+ else{
+ $scope.requestData = response.data.status;
+ $timeout.cancel();
+ $scope.backupLoading = true;
+ remoteBackupRestore();
+ }
+ }
+ else{
+
+ $scope.error_message = response.data.error_message;
+ $scope.backupLoading = true;
+ $scope.couldNotConnect = true;
+
+ // Notifications box settings
+
+ $scope.couldNotConnect = true;
+ $scope.errorMessage = false;
+ $scope.accountsFetched = true;
+ $scope.notificationsBox = false;
+ $timeout.cancel();
+
+ }
+
+ }
+
+ function cantLoadInitialDatas(response) {
+ // Notifications box settings
+
+ $scope.couldNotConnect = false;
+ $scope.errorMessage = true;
+ $scope.accountsFetched = true;
+ $scope.notificationsBox = false;
}
};
- $scope.submitBackupRestore = function() {
- $scope.status_success = true;
- $scope.status_danger = true;
- $scope.status_info = false;
- $scope.statusBox = "Restoring Backup";
-
- $scope.backupLoading = false;
- $scope.submitDisable = true;
-
+ function remoteBackupRestore(){
url = "/backup/remoteBackupRestore";
var data = {
- backupDir: backupDir
+ backupDir: tempTransferDir,
};
- console.log(data)
var config = {
headers: {
@@ -1267,42 +1381,241 @@ app.controller('remoteBackupControl', function($scope, $http, $timeout) {
}
};
- seek = 0
$http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas);
function ListInitialDatas(response) {
- console.log(response.data)
if (response.data.remoteRestoreStatus == 1) {
- $scope.request = false;
- $scope.backupLoading = false;
+ localRestoreStatus();
+ }
+ }
- $scope.status_danger = true;
- $scope.status_info = true;
- $scope.status_success = false;
- $scope.statusBox = "Restore in Progress, fetching details"
- getRestStatus();
- } else {
- $scope.submitDisable = false;
+ function cantLoadInitialDatas(response) {
+ // Notifications box settings
+
+ $scope.couldNotConnect = false;
+ $scope.errorMessage = true;
+ $scope.accountsFetched = true;
+ $scope.notificationsBox = false;
+ }
+
+ ///////////////
+
+ };
+
+ function localRestoreStatus(password) {
+
+
+
+ url = "/backup/localRestoreStatus";
+
+ var data = {
+ backupDir: tempTransferDir,
+ };
+
+ var config = {
+ headers: {
+ 'X-CSRFToken': getCookie('csrftoken')
+ }
+ };
+
+
+ $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas);
+
+ function ListInitialDatas(response) {
+
+ if (response.data.remoteTransferStatus == 1) {
+
+ if(response.data.complete == 0){
+ $scope.backupStatus = false;
+ $scope.requestData = response.data.status;
+ $timeout(localRestoreStatus, 2000);
+ }
+ else{
+ $scope.requestData = response.data.status;
+ $timeout.cancel();
+ $scope.backupLoading = true;
+ $scope.startTransferbtn = false;
+ }
+ }
+ else{
+
+ $scope.error_message = response.data.error_message;
$scope.backupLoading = true;
- $scope.status_danger = false;
- $scope.status_info = true;
- $scope.status_success = true;
- $scope.statusBox = "Unable to Restore Backups: " + response.data.error_message;
+ $scope.couldNotConnect = true;
+
+ // Notifications box settings
+
+ $scope.couldNotConnect = true;
+ $scope.errorMessage = false;
+ $scope.accountsFetched = true;
+ $scope.notificationsBox = false;
+
}
}
function cantLoadInitialDatas(response) {
- $scope.status_danger = false;
- $scope.status_info = true;
- $scope.status_success = true;
- $scope.statusBox = "Unable to connect";
+ // Notifications box settings
+
+ $scope.couldNotConnect = false;
+ $scope.errorMessage = true;
+ $scope.accountsFetched = true;
+ $scope.notificationsBox = false;
+ }
+ };
+
+
+ function restoreAccounts() {
+
+ url = "/backup/getRemoteTransferStatus";
+
+ var data = {
+ password : $scope.password,
+ ipAddress: $scope.IPAddress,
+ dir: tempTransferDir,
+ };
+
+ var config = {
+ headers: {
+ 'X-CSRFToken': getCookie('csrftoken')
+ }
+ };
+
+
+ $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas);
+
+ function ListInitialDatas(response) {
+
+ if (response.data.remoteTransferStatus == 1) {
+
+ if(response.data.backupsSent == 0){
+ $scope.backupStatus = false;
+ $scope.requestData = response.data.status;
+ $timeout(getBackupStatus, 2000);
+ }
+ else{
+ $timeout.cancel();
+ }
+ }
+
+ }
+
+ function cantLoadInitialDatas(response) {
+ // Notifications box settings
+
+ $scope.couldNotConnect = false;
+ $scope.errorMessage = true;
+ $scope.accountsFetched = true;
+ $scope.notificationsBox = false;
+ }
+ };
+
+ $scope.cancelRemoteBackup = function () {
+
+
+ $scope.backupLoading = false;
+
+ // notifications boxes
+ $scope.notificationsBox = true;
+ $scope.errorMessage = true;
+ $scope.couldNotConnect = true;
+ $scope.accountsFetched = true;
+ $scope.backupProcessStarted = true;
+ $scope.backupCancelled = true;
+
+ var IPAddress = $scope.IPAddress;
+ var password = $scope.password;
+
+ url = "/backup/cancelRemoteBackup";
+
+ var data = {
+ ipAddress: IPAddress,
+ password: password,
+ dir:tempTransferDir,
+ };
+
+ var config = {
+ headers: {
+ 'X-CSRFToken': getCookie('csrftoken')
+ }
+ };
+
+
+ $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas);
+
+ function ListInitialDatas(response) {
+
+ if (response.data.cancelStatus == 1) {
+ $scope.backupLoading = true;
+
+ // notifications boxes
+ $scope.notificationsBox = false;
+ $scope.errorMessage = true;
+ $scope.couldNotConnect = true;
+ $scope.accountsFetched = true;
+ $scope.backupProcessStarted = true;
+ $scope.backupCancelled = false;
+
+ // enable transfer button
+
+ $scope.startTransferbtn = false;
+
+ //disable cancel button
+
+ $scope.stopTransferbtn = true;
+
+ // hide status box
+
+ $scope.backupStatus = true;
+
+ // bring back websites table
+
+ $scope.accountsInRemoteServerTable = false;
+
+ // enable fetch button
+
+ $scope.fetchAccountsBtn = false;
+
+
+ }
+ else {
+
+ $scope.error_message = response.data.error_message;
+ $scope.backupLoading = true;
+
+ // notifications boxes
+
+ $scope.notificationsBox = false;
+ $scope.errorMessage = false;
+ $scope.couldNotConnect = true;
+ $scope.accountsFetched = true;
+ $scope.backupProcessStarted = true;
+ $scope.backupCancelled = true;
+
+
+
+ }
+
+ }
+
+ function cantLoadInitialDatas(response) {
+
+ // notifications boxes
+
+ $scope.notificationsBox = false;
+ $scope.errorMessage = true;
+ $scope.couldNotConnect = false;
+ $scope.accountsFetched = true;
+ $scope.backupProcessStarted = true;
+ $scope.backupCancelled = true;
+
}
};
+
});
///** Backup site ends **///
\ No newline at end of file
diff --git a/static/baseTemplate/custom-js/system-status.js b/static/baseTemplate/custom-js/system-status.js
index 0e1acce2e..899b204ed 100644
--- a/static/baseTemplate/custom-js/system-status.js
+++ b/static/baseTemplate/custom-js/system-status.js
@@ -124,6 +124,11 @@ app.controller('adminController', function($scope,$http,$timeout) {
$("#backupDestinations").hide();
$("#scheduleBackup").hide();
+ $("#remoteBackups").hide();
+ $("#packageHome").hide();
+ $("#packageSub").hide();
+ $("#createWebsite").hide();
+
}
}
diff --git a/static/packages/packages.js b/static/packages/packages.js
index 8145c2236..925f00e40 100644
--- a/static/packages/packages.js
+++ b/static/packages/packages.js
@@ -62,7 +62,8 @@ app.controller('createPackage', function($scope,$http) {
bandwidth: bandwidth,
ftpAccounts: ftpAccounts,
dataBases: dataBases,
- emails:emails
+ emails:emails,
+ allowedDomains:$scope.allowedDomains
};
var config = {
@@ -238,6 +239,7 @@ app.controller('modifyPackages', function($scope,$http) {
$scope.ftpAccounts = response.data.ftpAccounts;
$scope.dataBases = response.data.dataBases;
$scope.emails = response.data.emails;
+ $scope.allowedDomains = response.data.allowedDomains;
$scope.modifyButton = "Save Details"
@@ -285,7 +287,8 @@ app.controller('modifyPackages', function($scope,$http) {
bandwidth:bandwidth,
ftpAccounts:ftpAccounts,
dataBases:dataBases,
- emails:emails
+ emails:emails,
+ allowedDomains:$scope.allowedDomains,
};
var config = {
diff --git a/static/websiteFunctions/websiteFunctions.js b/static/websiteFunctions/websiteFunctions.js
index c3435f118..ed008dcc9 100644
--- a/static/websiteFunctions/websiteFunctions.js
+++ b/static/websiteFunctions/websiteFunctions.js
@@ -1198,11 +1198,438 @@ app.controller('websitePages', function($scope,$http) {
+ }
+
+ };
+
+
+ ////// create domain part
+
+ $("#domainCreationForm").hide();
+
+ $scope.showCreateDomainForm = function () {
+ $("#domainCreationForm").fadeIn();
+ };
+
+ $scope.hideDomainCreationForm = function () {
+ $("#domainCreationForm").fadeOut();
+ };
+
+ $scope.masterDomain = $("#domainNamePage").text();
+
+ // notifcations settings
+ $scope.domainLoading = true;
+ $scope.websiteCreationFailed = true;
+ $scope.domainCreated = true;
+ $scope.couldNotConnect = true;
+
+ $scope.createDomain = function(){
+
+ // notifcations settings
+ $scope.domainLoading = false;
+ $scope.websiteCreationFailed = true;
+ $scope.domainCreated = true;
+ $scope.couldNotConnect = true;
+
+ if ($scope.sslCheck === true){
+ var ssl = 1;
+ }
+ else{
+ var ssl = 0
+ }
+
+
+ url = "/websites/submitDomainCreation";
+ var domainName = $scope.domainNameCreate;
+ var phpSelection = $scope.phpSelection;
+
+ var path = $scope.docRootPath;
+
+ if (typeof path === 'undefined'){
+ path = "";
+ }
+
+
+ var data = {
+ domainName: domainName,
+ phpSelection: phpSelection,
+ ssl:ssl,
+ path:path,
+ masterDomain:$("#domainNamePage").text(),
+ };
+
+ var config = {
+ headers : {
+ 'X-CSRFToken': getCookie('csrftoken')
+ }
+ };
+
+ $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+ function ListInitialDatas(response) {
+
+
+ if(response.data.createWebSiteStatus === 1){
+
+ $scope.websiteDomain = domainName;
+
+ // notifcations settings
+ $scope.domainLoading = true;
+ $scope.websiteCreationFailed = true;
+ $scope.domainCreated = false;
+ $scope.couldNotConnect = true
+
+
+ }
+ else{
+
+ $scope.errorMessage = response.data.error_message;
+
+ // notifcations settings
+ $scope.domainLoading = true;
+ $scope.websiteCreationFailed = false;
+ $scope.domainCreated = true;
+ $scope.couldNotConnect = true;
+
+ }
+
+
+ }
+ function cantLoadInitialDatas(response) {
+
+ // notifcations settings
+ $scope.domainLoading = true;
+ $scope.websiteCreationFailed = true;
+ $scope.domainCreated = true;
+ $scope.couldNotConnect = false;
+
+ }
+
+
+
+
+
+ };
+
+
+ ////// List Domains Part
+
+ ////////////////////////
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = true;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+
+ $("#listDomains").hide();
+
+
+ $scope.showListDomains = function () {
+ fetchDomains();
+ $("#listDomains").fadeIn();
+ };
+
+ $scope.hideListDomains = function () {
+ $("#listDomains").fadeOut();
+ };
+
+ function fetchDomains(){
+ $scope.domainLoading = false;
+
+ var url = "/websites/fetchDomains";
+
+ var data = {
+ masterDomain:$("#domainNamePage").text(),
+ };
+
+ var config = {
+ headers : {
+ 'X-CSRFToken': getCookie('csrftoken')
+ }
+ };
+
+ $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+ function ListInitialDatas(response) {
+
+
+ if(response.data.fetchStatus === 1){
+
+ $scope.childDomains = JSON.parse(response.data.data);
+ $scope.domainLoading = true;
+
+
+ }
+ else{
+ $scope.domainError = false;
+ $scope.errorMessage = response.data.error_message;
+ $scope.domainLoading = true;
+ }
+
+
+ }
+ function cantLoadInitialDatas(response) {
+
+ $scope.couldNotConnect = false;
+
}
}
+ $scope.changePHP = function(childDomain,phpSelection){
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = true;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+ $scope.domainLoading = false;
+
+ var url = "/websites/changePHP";
+
+ var data = {
+ childDomain:childDomain,
+ phpSelection:phpSelection,
+ };
+
+ var config = {
+ headers : {
+ 'X-CSRFToken': getCookie('csrftoken')
+ }
+ };
+
+ $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+ function ListInitialDatas(response) {
+
+
+ if(response.data.changePHP === 1){
+
+ $scope.domainLoading = true;
+
+ $scope.changedPHPVersion = phpSelection;
+
+
+ // notifcations
+
+ $scope.phpChanged = false;
+ $scope.domainError = true;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+
+
+ }
+ else{
+ $scope.errorMessage = response.data.error_message;
+ $scope.domainLoading = true;
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = false;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+ }
+
+
+ }
+ function cantLoadInitialDatas(response) {
+
+ $scope.domainLoading = true;
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = false;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+
+ }
+
+ }
+
+ $scope.deleteChildDomain = function(childDomain){
+ $scope.domainLoading = false;
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = true;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+
+ url = "/websites/submitDomainDeletion";
+
+ var data = {
+ websiteName: childDomain,
+ };
+
+ var config = {
+ headers : {
+ 'X-CSRFToken': getCookie('csrftoken')
+ }
+ };
+
+ $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+ function ListInitialDatas(response) {
+
+
+ if(response.data.websiteDeleteStatus === 1){
+
+ $scope.domainLoading = true;
+ $scope.deletedDomain = childDomain;
+
+ fetchDomains();
+
+
+ // notifications
+
+ $scope.phpChanged = true;
+ $scope.domainError = true;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = false;
+ $scope.sslIssued = true;
+
+
+
+ }
+ else{
+ $scope.errorMessage = response.data.error_message;
+ $scope.domainLoading = true;
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = false;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+ }
+
+
+ }
+ function cantLoadInitialDatas(response) {
+
+ $scope.domainLoading = true;
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = true;
+ $scope.couldNotConnect = false;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+
+ }
+
+ }
+
+ $scope.issueSSL = function(childDomain,path){
+ $scope.domainLoading = false;
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = true;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+
+ var url = "/manageSSL/issueSSL";
+
+
+ var data = {
+ virtualHost:childDomain,
+ path:path,
+ };
+
+ var config = {
+ headers : {
+ 'X-CSRFToken': getCookie('csrftoken')
+ }
+ };
+
+ $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+ function ListInitialDatas(response) {
+
+
+ if(response.data.SSL == 1){
+
+ $scope.domainLoading = true;
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = true;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = false;
+
+
+
+ $scope.sslDomainIssued = childDomain;
+
+
+ }
+
+ else
+ {
+ $scope.domainLoading = true;
+
+ $scope.errorMessage = response.data.error_message;
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = false;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+
+ }
+
+
+
+ }
+ function cantLoadInitialDatas(response) {
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = true;
+ $scope.couldNotConnect = false;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+
+
+ }
+
+
+
+
+
+ };
+
+
+
+
});
/* Java script code to create account ends here */
diff --git a/websiteFunctions/models.py b/websiteFunctions/models.py
index d7ed60c51..f267d1cf1 100644
--- a/websiteFunctions/models.py
+++ b/websiteFunctions/models.py
@@ -17,6 +17,14 @@ class Websites(models.Model):
ssl = models.IntegerField()
state = models.IntegerField(default=1)
+class ChildDomains(models.Model):
+ master = models.ForeignKey(Websites,on_delete=models.CASCADE)
+ domain = models.CharField(max_length=50, unique=True)
+ path = models.CharField(max_length=200,default=None)
+ ssl = models.IntegerField()
+ phpSelection = models.CharField(max_length=10,default=None)
+
+
class Backups(models.Model):
website = models.ForeignKey(Websites,on_delete=models.CASCADE)
fileName = models.CharField(max_length=50)
diff --git a/websiteFunctions/models.pyc b/websiteFunctions/models.pyc
index 9d4a0c592..04409ac6d 100644
Binary files a/websiteFunctions/models.pyc and b/websiteFunctions/models.pyc differ
diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js
index c3435f118..ed008dcc9 100644
--- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js
+++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js
@@ -1198,11 +1198,438 @@ app.controller('websitePages', function($scope,$http) {
+ }
+
+ };
+
+
+ ////// create domain part
+
+ $("#domainCreationForm").hide();
+
+ $scope.showCreateDomainForm = function () {
+ $("#domainCreationForm").fadeIn();
+ };
+
+ $scope.hideDomainCreationForm = function () {
+ $("#domainCreationForm").fadeOut();
+ };
+
+ $scope.masterDomain = $("#domainNamePage").text();
+
+ // notifcations settings
+ $scope.domainLoading = true;
+ $scope.websiteCreationFailed = true;
+ $scope.domainCreated = true;
+ $scope.couldNotConnect = true;
+
+ $scope.createDomain = function(){
+
+ // notifcations settings
+ $scope.domainLoading = false;
+ $scope.websiteCreationFailed = true;
+ $scope.domainCreated = true;
+ $scope.couldNotConnect = true;
+
+ if ($scope.sslCheck === true){
+ var ssl = 1;
+ }
+ else{
+ var ssl = 0
+ }
+
+
+ url = "/websites/submitDomainCreation";
+ var domainName = $scope.domainNameCreate;
+ var phpSelection = $scope.phpSelection;
+
+ var path = $scope.docRootPath;
+
+ if (typeof path === 'undefined'){
+ path = "";
+ }
+
+
+ var data = {
+ domainName: domainName,
+ phpSelection: phpSelection,
+ ssl:ssl,
+ path:path,
+ masterDomain:$("#domainNamePage").text(),
+ };
+
+ var config = {
+ headers : {
+ 'X-CSRFToken': getCookie('csrftoken')
+ }
+ };
+
+ $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+ function ListInitialDatas(response) {
+
+
+ if(response.data.createWebSiteStatus === 1){
+
+ $scope.websiteDomain = domainName;
+
+ // notifcations settings
+ $scope.domainLoading = true;
+ $scope.websiteCreationFailed = true;
+ $scope.domainCreated = false;
+ $scope.couldNotConnect = true
+
+
+ }
+ else{
+
+ $scope.errorMessage = response.data.error_message;
+
+ // notifcations settings
+ $scope.domainLoading = true;
+ $scope.websiteCreationFailed = false;
+ $scope.domainCreated = true;
+ $scope.couldNotConnect = true;
+
+ }
+
+
+ }
+ function cantLoadInitialDatas(response) {
+
+ // notifcations settings
+ $scope.domainLoading = true;
+ $scope.websiteCreationFailed = true;
+ $scope.domainCreated = true;
+ $scope.couldNotConnect = false;
+
+ }
+
+
+
+
+
+ };
+
+
+ ////// List Domains Part
+
+ ////////////////////////
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = true;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+
+ $("#listDomains").hide();
+
+
+ $scope.showListDomains = function () {
+ fetchDomains();
+ $("#listDomains").fadeIn();
+ };
+
+ $scope.hideListDomains = function () {
+ $("#listDomains").fadeOut();
+ };
+
+ function fetchDomains(){
+ $scope.domainLoading = false;
+
+ var url = "/websites/fetchDomains";
+
+ var data = {
+ masterDomain:$("#domainNamePage").text(),
+ };
+
+ var config = {
+ headers : {
+ 'X-CSRFToken': getCookie('csrftoken')
+ }
+ };
+
+ $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+ function ListInitialDatas(response) {
+
+
+ if(response.data.fetchStatus === 1){
+
+ $scope.childDomains = JSON.parse(response.data.data);
+ $scope.domainLoading = true;
+
+
+ }
+ else{
+ $scope.domainError = false;
+ $scope.errorMessage = response.data.error_message;
+ $scope.domainLoading = true;
+ }
+
+
+ }
+ function cantLoadInitialDatas(response) {
+
+ $scope.couldNotConnect = false;
+
}
}
+ $scope.changePHP = function(childDomain,phpSelection){
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = true;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+ $scope.domainLoading = false;
+
+ var url = "/websites/changePHP";
+
+ var data = {
+ childDomain:childDomain,
+ phpSelection:phpSelection,
+ };
+
+ var config = {
+ headers : {
+ 'X-CSRFToken': getCookie('csrftoken')
+ }
+ };
+
+ $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+ function ListInitialDatas(response) {
+
+
+ if(response.data.changePHP === 1){
+
+ $scope.domainLoading = true;
+
+ $scope.changedPHPVersion = phpSelection;
+
+
+ // notifcations
+
+ $scope.phpChanged = false;
+ $scope.domainError = true;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+
+
+ }
+ else{
+ $scope.errorMessage = response.data.error_message;
+ $scope.domainLoading = true;
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = false;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+ }
+
+
+ }
+ function cantLoadInitialDatas(response) {
+
+ $scope.domainLoading = true;
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = false;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+
+ }
+
+ }
+
+ $scope.deleteChildDomain = function(childDomain){
+ $scope.domainLoading = false;
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = true;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+
+ url = "/websites/submitDomainDeletion";
+
+ var data = {
+ websiteName: childDomain,
+ };
+
+ var config = {
+ headers : {
+ 'X-CSRFToken': getCookie('csrftoken')
+ }
+ };
+
+ $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+ function ListInitialDatas(response) {
+
+
+ if(response.data.websiteDeleteStatus === 1){
+
+ $scope.domainLoading = true;
+ $scope.deletedDomain = childDomain;
+
+ fetchDomains();
+
+
+ // notifications
+
+ $scope.phpChanged = true;
+ $scope.domainError = true;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = false;
+ $scope.sslIssued = true;
+
+
+
+ }
+ else{
+ $scope.errorMessage = response.data.error_message;
+ $scope.domainLoading = true;
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = false;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+ }
+
+
+ }
+ function cantLoadInitialDatas(response) {
+
+ $scope.domainLoading = true;
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = true;
+ $scope.couldNotConnect = false;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+
+ }
+
+ }
+
+ $scope.issueSSL = function(childDomain,path){
+ $scope.domainLoading = false;
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = true;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+
+ var url = "/manageSSL/issueSSL";
+
+
+ var data = {
+ virtualHost:childDomain,
+ path:path,
+ };
+
+ var config = {
+ headers : {
+ 'X-CSRFToken': getCookie('csrftoken')
+ }
+ };
+
+ $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+ function ListInitialDatas(response) {
+
+
+ if(response.data.SSL == 1){
+
+ $scope.domainLoading = true;
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = true;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = false;
+
+
+
+ $scope.sslDomainIssued = childDomain;
+
+
+ }
+
+ else
+ {
+ $scope.domainLoading = true;
+
+ $scope.errorMessage = response.data.error_message;
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = false;
+ $scope.couldNotConnect = true;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+
+ }
+
+
+
+ }
+ function cantLoadInitialDatas(response) {
+
+ // notifcations
+
+ $scope.phpChanged = true;
+ $scope.domainError = true;
+ $scope.couldNotConnect = false;
+ $scope.domainDeleted = true;
+ $scope.sslIssued = true;
+
+
+ }
+
+
+
+
+
+ };
+
+
+
+
});
/* Java script code to create account ends here */
diff --git a/websiteFunctions/templates/websiteFunctions/createWebsite.html b/websiteFunctions/templates/websiteFunctions/createWebsite.html
index eb10551af..17840ee72 100644
--- a/websiteFunctions/templates/websiteFunctions/createWebsite.html
+++ b/websiteFunctions/templates/websiteFunctions/createWebsite.html
@@ -22,7 +22,7 @@
diff --git a/websiteFunctions/templates/websiteFunctions/website.html b/websiteFunctions/templates/websiteFunctions/website.html
index 48719eaf8..360518eac 100644
--- a/websiteFunctions/templates/websiteFunctions/website.html
+++ b/websiteFunctions/templates/websiteFunctions/website.html
@@ -211,12 +211,236 @@
-
+
@@ -435,7 +659,7 @@
+
+ {% trans "Domains" %}
+
+
+ {% trans "Domains" %} 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+