Bladeren bron

Merge pull request #190 from dustindauncey/master

Fixed English typo's and grammatical errors and improved English translations.
Serghey Rodin 11 jaren geleden
bovenliggende
commit
f7557077be
2 gewijzigde bestanden met toevoegingen van 37 en 37 verwijderingen
  1. 1 1
      bin/v-add-cron-job
  2. 36 36
      web/inc/i18n/en.php

+ 1 - 1
bin/v-add-cron-job

@@ -55,7 +55,7 @@ str="$str CMD='$command' SUSPENDED='no' TIME='$TIME' DATE='$DATE'"
 # Adding to crontab
 echo "$str" >> $VESTA/data/users/$user/cron.conf
 
-# Chaning permissions
+# Changing permissions
 chmod 660 $VESTA/data/users/$user/cron.conf
 
 # Sort jobs by id number

+ 36 - 36
web/inc/i18n/en.php

@@ -265,7 +265,7 @@ $LANG['en'] = array(
     'Message'  => 'Message',
     'use local-part'  => 'use local-part',
     'one or more email addresses'  => 'one or more email addresses',
-    'Prefix will be automaticaly added to database name and database user'  => 'Prefix  %s will be automaticaly added to database name and database user',
+    'Prefix will be automaticaly added to database name and database user'  => 'Prefix  %s will be automaticaly added to database name and database user.',
     'Database'  => 'Database',
     'Type'  => 'Type',
     'Minute'  => 'Minute',
@@ -355,50 +355,50 @@ $LANG['en'] = array(
     '%s objects'  => '%s objects',
     'no exclusions' => 'no exclusions',
 
-    'USER_CREATED_OK'  => 'User <a href="/edit/user/?user=%s"><b>%s</b></a> has been created successfully',
+    'USER_CREATED_OK'  => 'User <a href="/edit/user/?user=%s"><b>%s</b></a> has been created successfully.',
     'WEB_DOMAIN_CREATED_OK'  => 'Domain <a href="/edit/web/?domain=%s"><b>%s</b></a> has been created successfully.',
     'DNS_DOMAIN_CREATED_OK'  => 'DNS domain <a href="/list/dns/?domain=%s"><b>%s</b></a> has been created successfully.',
     'DNS_RECORD_CREATED_OK'  => 'Record <b>%s.%s</b> has been created successfully.',
     'MAIL_DOMAIN_CREATED_OK'  => 'Mail domain <a href="/list/mail/?domain=%s"><b>%s</b></a> has been created successfully.',
-    'MAIL_ACCOUNT_CREATED_OK'  => 'Mail account <a href="/edit/mail/?account=%s&domain=%s"><b>%s@%s</b></a> has been created successfully',
-    'DATABASE_CREATED_OK'  => 'Database <a href="/edit/db/?database=%s"><b>%s</b></a> has been created successfully',
+    'MAIL_ACCOUNT_CREATED_OK'  => 'Mail account <a href="/edit/mail/?account=%s&domain=%s"><b>%s@%s</b></a> has been created successfully.',
+    'DATABASE_CREATED_OK'  => 'Database <a href="/edit/db/?database=%s"><b>%s</b></a> has been created successfully.',
     'CRON_CREATED_OK'  => 'Cron job has been created successfully.',
     'IP_CREATED_OK'  => 'IP address <a href="/edit/ip/?ip=%s"><b>%s</b></a> has been created successfully.',
     'PACKAGE_CREATED_OK'  => 'Package <a href="/edit/package/?package=%s"><b>%s</b></a> has been created successfully.',
     'SSL_GENERATED_OK' => 'Certificate has been generated successfully.',
-    'Autoupdate has been successfully enabled' => 'Autoupdate has been successfully enabled',
-    'Autoupdate has been successfully disabled' => 'Autoupdate has been successfully disabled',
-    'Changes has been saved.'  => 'Changes has been saved.',
+    'Autoupdate has been successfully enabled' => 'Autoupdate has been successfully enabled.',
+    'Autoupdate has been successfully disabled' => 'Autoupdate has been successfully disabled.',
+    'Changes has been saved.'  => 'Changes have been saved.',
     'Confirmation'  => 'Confirmation',
-    'DELETE_USER_CONFIRMATION' => 'Are you sure to delete user %s?',
-    'SUSPEND_USER_CONFIRMATION' => 'Are you sure to suspend user %s?',
-    'UNSUSPEND_USER_CONFIRMATION' => 'Are you sure to unsuspend user %s?',
-    'DELETE_DOMAIN_CONFIRMATION' => 'Are you sure to delete domain %s?',
-    'SUSPEND_DOMAIN_CONFIRMATION' => 'Are you sure to suspend domain %s?',
-    'UNSUSPEND_DOMAIN_CONFIRMATION' => 'Are you sure to unsuspend domain %s?',
-    'DELETE_RECORD_CONFIRMATION' => 'Are you sure to delete record %s?',
-    'SUSPEND_RECORD_CONFIRMATION' => 'Are you sure to suspend record %s?',
-    'UNSUSPEND_RECORD_CONFIRMATION' => 'Are you sure to unsuspend record %s?',
-    'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'Are you sure to delete %s?',
-    'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Are you sure to suspend %s?',
-    'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Are you sure to unsuspend %s?',
-    'DELETE_DATABASE_CONFIRMATION' => 'Are you sure to delete database %s?',
-    'SUSPEND_DATABASE_CONFIRMATION' => 'Are you sure to suspend database %s?',
-    'UNSUSPEND_DATABASE_CONFIRMATION' => 'Are you sure to unsuspend database %s?',
-    'DELETE_CRON_CONFIRMATION' => 'Are you sure to delete cron job?',
-    'SUSPEND_CRON_CONFIRMATION' => 'Are you sure to suspend cron job?',
-    'UNSUSPEND_CRON_CONFIRMATION' => 'Are you sure to unsuspend cron job?',
-    'DELETE_BACKUP_CONFIRMATION'  => 'Are you sure to delete %s backup?',
-    'DELETE_EXCLUSION_CONFIRMATION' => 'Are you sure to delete %s exclusion?',
-    'DELETE_PACKAGE_CONFIRMATION'  => 'Are you sure to delete package %s?',
-    'DELETE_IP_CONFIRMATION'  => 'Are you sure to delere IP address %s?',
+    'DELETE_USER_CONFIRMATION' => 'Are you sure you want to delete user %s?',
+    'SUSPEND_USER_CONFIRMATION' => 'Are you sure you want to suspend user %s?',
+    'UNSUSPEND_USER_CONFIRMATION' => 'Are you sure you want to unsuspend user %s?',
+    'DELETE_DOMAIN_CONFIRMATION' => 'Are you sure you want to delete domain %s?',
+    'SUSPEND_DOMAIN_CONFIRMATION' => 'Are you sure you want to suspend domain %s?',
+    'UNSUSPEND_DOMAIN_CONFIRMATION' => 'Are you sure you want to unsuspend domain %s?',
+    'DELETE_RECORD_CONFIRMATION' => 'Are you sure you want to delete record %s?',
+    'SUSPEND_RECORD_CONFIRMATION' => 'Are you sure you want to suspend record %s?',
+    'UNSUSPEND_RECORD_CONFIRMATION' => 'Are you sure you want to unsuspend record %s?',
+    'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'Are you sure you want to delete %s?',
+    'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Are you sure you want to suspend %s?',
+    'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Are you sure you want to unsuspend %s?',
+    'DELETE_DATABASE_CONFIRMATION' => 'Are you sure you want to delete database %s?',
+    'SUSPEND_DATABASE_CONFIRMATION' => 'Are you sure you want to suspend database %s?',
+    'UNSUSPEND_DATABASE_CONFIRMATION' => 'Are you sure you want to unsuspend database %s?',
+    'DELETE_CRON_CONFIRMATION' => 'Are you sure you want to delete cron job?',
+    'SUSPEND_CRON_CONFIRMATION' => 'Are you sure you want to suspend cron job?',
+    'UNSUSPEND_CRON_CONFIRMATION' => 'Are you sure you want to unsuspend cron job?',
+    'DELETE_BACKUP_CONFIRMATION'  => 'Are you sure you want to delete %s backup?',
+    'DELETE_EXCLUSION_CONFIRMATION' => 'Are you sure you want to delete %s exclusion?',
+    'DELETE_PACKAGE_CONFIRMATION'  => 'Are you sure you want to delete package %s?',
+    'DELETE_IP_CONFIRMATION'  => 'Are you sure you want to delete IP address %s?',
     'Welcome'  => 'Welcome',
     'LOGGED_IN_AS'  => 'Logged in as user %s',
     'Error'  => 'Error',
-    'Invalid username or password'  => 'Invalid username or password',
-    'Invalid username or code'  => 'Invalid username or code',
-    'Passwords not match'  => 'Passwords not match',
-    'Please enter valid email address.'  => 'Please enter valid email address.',
+    'Invalid username or password'  => 'Invalid username or password.',
+    'Invalid username or code'  => 'Invalid username or code.',
+    'Passwords not match'  => 'Passwords do not match.',
+    'Please enter valid email address.'  => 'Please enter a valid email address.',
     'Field "%s" can not be blank.'  => 'Field "%s" can not be blank.',
     'Password is too short.'  => 'Password is too short (minimum is 6 characters)',
     'Error code:'  => 'Error code: %s',
@@ -406,7 +406,7 @@ $LANG['en'] = array(
     'IP address is in use' => 'IP address is in use',
     'BACKUP_SCHEDULED'  => 'Task has been added to the queue. You will receive an email notification when your backup is ready for download.',
     'BACKUP_EXISTS'  => 'An existing backup is already running. Please wait for that backup to finish.',
-    'RESTORE_SCHEDULED'  => 'Task has been added to the queue. You will receive an email notification when your backup is ready for download.',
+    'RESTORE_SCHEDULED'  => 'Task has been added to the queue. You will receive an email notification when your restore has been completed.',
     'RESTORE_EXISTS'  => 'An existing restoration task is already running. Please wait for it to finish before launching it again.',
 
     'WEB_EXCLUSIONS' => "Type domain name, one per line. To exclude all domains use *. To exclude specific dirs use following format: domain.com:public_html/cache:public_html/tmp",
@@ -420,10 +420,10 @@ $LANG['en'] = array(
     'MAIL_FROM'  => 'Vesta Control Panel <noreply@%s>',
     'GREETINGS_GORDON_FREEMAN' => "Hello, %s %s,\n",
     'GREETINGS' => "Hello,\n",
-    'ACCOUNT_READY' => "Your account has been created and ready for use.\n\nhttps://%s/login/\nUsername: %s\nPassword: %s\n\n--\nVesta Control Panel\n",
+    'ACCOUNT_READY' => "Your account has been created and is ready for use.\n\nhttps://%s/login/\nUsername: %s\nPassword: %s\n\n--\nVesta Control Panel\n",
 
     'FTP login credentials'  => 'FTP login credentials',
-    'FTP_ACCOUNT_READY' => "FTP account has been created and ready for use.\n\nHostname: %s\nUsername: %s_%s\nPassword: %s\n\n--\nVesta Control Panel\n",
+    'FTP_ACCOUNT_READY' => "FTP account has been created and is ready for use.\n\nHostname: %s\nUsername: %s_%s\nPassword: %s\n\n--\nVesta Control Panel\n",
 
     'Database Credentials'  => 'Database Credentials',
     'DATABASE_READY' => "Database has been created successfully.\n\nDatabase: %s\nUser: %s\nPassword: %s\n%s\n\n--\nVesta Control Panel\n",