Skip to content

Commit f755707

Browse files
committed
Merge pull request hestiacp#190 from dustindauncey/master
Fixed English typo's and grammatical errors and improved English translations.
2 parents bf7058f + d580ce6 commit f755707

File tree

2 files changed

+37
-37
lines changed

2 files changed

+37
-37
lines changed

bin/v-add-cron-job

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ str="$str CMD='$command' SUSPENDED='no' TIME='$TIME' DATE='$DATE'"
5555
# Adding to crontab
5656
echo "$str" >> $VESTA/data/users/$user/cron.conf
5757

58-
# Chaning permissions
58+
# Changing permissions
5959
chmod 660 $VESTA/data/users/$user/cron.conf
6060

6161
# Sort jobs by id number

web/inc/i18n/en.php

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@
265265
'Message' => 'Message',
266266
'use local-part' => 'use local-part',
267267
'one or more email addresses' => 'one or more email addresses',
268-
'Prefix will be automaticaly added to database name and database user' => 'Prefix %s will be automaticaly added to database name and database user',
268+
'Prefix will be automaticaly added to database name and database user' => 'Prefix %s will be automaticaly added to database name and database user.',
269269
'Database' => 'Database',
270270
'Type' => 'Type',
271271
'Minute' => 'Minute',
@@ -355,58 +355,58 @@
355355
'%s objects' => '%s objects',
356356
'no exclusions' => 'no exclusions',
357357

358-
'USER_CREATED_OK' => 'User <a href="/edit/user/?user=%s"><b>%s</b></a> has been created successfully',
358+
'USER_CREATED_OK' => 'User <a href="/edit/user/?user=%s"><b>%s</b></a> has been created successfully.',
359359
'WEB_DOMAIN_CREATED_OK' => 'Domain <a href="/edit/web/?domain=%s"><b>%s</b></a> has been created successfully.',
360360
'DNS_DOMAIN_CREATED_OK' => 'DNS domain <a href="/list/dns/?domain=%s"><b>%s</b></a> has been created successfully.',
361361
'DNS_RECORD_CREATED_OK' => 'Record <b>%s.%s</b> has been created successfully.',
362362
'MAIL_DOMAIN_CREATED_OK' => 'Mail domain <a href="/list/mail/?domain=%s"><b>%s</b></a> has been created successfully.',
363-
'MAIL_ACCOUNT_CREATED_OK' => 'Mail account <a href="/edit/mail/?account=%s&domain=%s"><b>%s@%s</b></a> has been created successfully',
364-
'DATABASE_CREATED_OK' => 'Database <a href="/edit/db/?database=%s"><b>%s</b></a> has been created successfully',
363+
'MAIL_ACCOUNT_CREATED_OK' => 'Mail account <a href="/edit/mail/?account=%s&domain=%s"><b>%s@%s</b></a> has been created successfully.',
364+
'DATABASE_CREATED_OK' => 'Database <a href="/edit/db/?database=%s"><b>%s</b></a> has been created successfully.',
365365
'CRON_CREATED_OK' => 'Cron job has been created successfully.',
366366
'IP_CREATED_OK' => 'IP address <a href="/edit/ip/?ip=%s"><b>%s</b></a> has been created successfully.',
367367
'PACKAGE_CREATED_OK' => 'Package <a href="/edit/package/?package=%s"><b>%s</b></a> has been created successfully.',
368368
'SSL_GENERATED_OK' => 'Certificate has been generated successfully.',
369-
'Autoupdate has been successfully enabled' => 'Autoupdate has been successfully enabled',
370-
'Autoupdate has been successfully disabled' => 'Autoupdate has been successfully disabled',
371-
'Changes has been saved.' => 'Changes has been saved.',
369+
'Autoupdate has been successfully enabled' => 'Autoupdate has been successfully enabled.',
370+
'Autoupdate has been successfully disabled' => 'Autoupdate has been successfully disabled.',
371+
'Changes has been saved.' => 'Changes have been saved.',
372372
'Confirmation' => 'Confirmation',
373-
'DELETE_USER_CONFIRMATION' => 'Are you sure to delete user %s?',
374-
'SUSPEND_USER_CONFIRMATION' => 'Are you sure to suspend user %s?',
375-
'UNSUSPEND_USER_CONFIRMATION' => 'Are you sure to unsuspend user %s?',
376-
'DELETE_DOMAIN_CONFIRMATION' => 'Are you sure to delete domain %s?',
377-
'SUSPEND_DOMAIN_CONFIRMATION' => 'Are you sure to suspend domain %s?',
378-
'UNSUSPEND_DOMAIN_CONFIRMATION' => 'Are you sure to unsuspend domain %s?',
379-
'DELETE_RECORD_CONFIRMATION' => 'Are you sure to delete record %s?',
380-
'SUSPEND_RECORD_CONFIRMATION' => 'Are you sure to suspend record %s?',
381-
'UNSUSPEND_RECORD_CONFIRMATION' => 'Are you sure to unsuspend record %s?',
382-
'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'Are you sure to delete %s?',
383-
'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Are you sure to suspend %s?',
384-
'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Are you sure to unsuspend %s?',
385-
'DELETE_DATABASE_CONFIRMATION' => 'Are you sure to delete database %s?',
386-
'SUSPEND_DATABASE_CONFIRMATION' => 'Are you sure to suspend database %s?',
387-
'UNSUSPEND_DATABASE_CONFIRMATION' => 'Are you sure to unsuspend database %s?',
388-
'DELETE_CRON_CONFIRMATION' => 'Are you sure to delete cron job?',
389-
'SUSPEND_CRON_CONFIRMATION' => 'Are you sure to suspend cron job?',
390-
'UNSUSPEND_CRON_CONFIRMATION' => 'Are you sure to unsuspend cron job?',
391-
'DELETE_BACKUP_CONFIRMATION' => 'Are you sure to delete %s backup?',
392-
'DELETE_EXCLUSION_CONFIRMATION' => 'Are you sure to delete %s exclusion?',
393-
'DELETE_PACKAGE_CONFIRMATION' => 'Are you sure to delete package %s?',
394-
'DELETE_IP_CONFIRMATION' => 'Are you sure to delere IP address %s?',
373+
'DELETE_USER_CONFIRMATION' => 'Are you sure you want to delete user %s?',
374+
'SUSPEND_USER_CONFIRMATION' => 'Are you sure you want to suspend user %s?',
375+
'UNSUSPEND_USER_CONFIRMATION' => 'Are you sure you want to unsuspend user %s?',
376+
'DELETE_DOMAIN_CONFIRMATION' => 'Are you sure you want to delete domain %s?',
377+
'SUSPEND_DOMAIN_CONFIRMATION' => 'Are you sure you want to suspend domain %s?',
378+
'UNSUSPEND_DOMAIN_CONFIRMATION' => 'Are you sure you want to unsuspend domain %s?',
379+
'DELETE_RECORD_CONFIRMATION' => 'Are you sure you want to delete record %s?',
380+
'SUSPEND_RECORD_CONFIRMATION' => 'Are you sure you want to suspend record %s?',
381+
'UNSUSPEND_RECORD_CONFIRMATION' => 'Are you sure you want to unsuspend record %s?',
382+
'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'Are you sure you want to delete %s?',
383+
'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Are you sure you want to suspend %s?',
384+
'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Are you sure you want to unsuspend %s?',
385+
'DELETE_DATABASE_CONFIRMATION' => 'Are you sure you want to delete database %s?',
386+
'SUSPEND_DATABASE_CONFIRMATION' => 'Are you sure you want to suspend database %s?',
387+
'UNSUSPEND_DATABASE_CONFIRMATION' => 'Are you sure you want to unsuspend database %s?',
388+
'DELETE_CRON_CONFIRMATION' => 'Are you sure you want to delete cron job?',
389+
'SUSPEND_CRON_CONFIRMATION' => 'Are you sure you want to suspend cron job?',
390+
'UNSUSPEND_CRON_CONFIRMATION' => 'Are you sure you want to unsuspend cron job?',
391+
'DELETE_BACKUP_CONFIRMATION' => 'Are you sure you want to delete %s backup?',
392+
'DELETE_EXCLUSION_CONFIRMATION' => 'Are you sure you want to delete %s exclusion?',
393+
'DELETE_PACKAGE_CONFIRMATION' => 'Are you sure you want to delete package %s?',
394+
'DELETE_IP_CONFIRMATION' => 'Are you sure you want to delete IP address %s?',
395395
'Welcome' => 'Welcome',
396396
'LOGGED_IN_AS' => 'Logged in as user %s',
397397
'Error' => 'Error',
398-
'Invalid username or password' => 'Invalid username or password',
399-
'Invalid username or code' => 'Invalid username or code',
400-
'Passwords not match' => 'Passwords not match',
401-
'Please enter valid email address.' => 'Please enter valid email address.',
398+
'Invalid username or password' => 'Invalid username or password.',
399+
'Invalid username or code' => 'Invalid username or code.',
400+
'Passwords not match' => 'Passwords do not match.',
401+
'Please enter valid email address.' => 'Please enter a valid email address.',
402402
'Field "%s" can not be blank.' => 'Field "%s" can not be blank.',
403403
'Password is too short.' => 'Password is too short (minimum is 6 characters)',
404404
'Error code:' => 'Error code: %s',
405405
'SERVICE_ACTION_FAILED' => '"%s" "%s" failed',
406406
'IP address is in use' => 'IP address is in use',
407407
'BACKUP_SCHEDULED' => 'Task has been added to the queue. You will receive an email notification when your backup is ready for download.',
408408
'BACKUP_EXISTS' => 'An existing backup is already running. Please wait for that backup to finish.',
409-
'RESTORE_SCHEDULED' => 'Task has been added to the queue. You will receive an email notification when your backup is ready for download.',
409+
'RESTORE_SCHEDULED' => 'Task has been added to the queue. You will receive an email notification when your restore has been completed.',
410410
'RESTORE_EXISTS' => 'An existing restoration task is already running. Please wait for it to finish before launching it again.',
411411

412412
'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 @@
420420
'MAIL_FROM' => 'Vesta Control Panel <noreply@%s>',
421421
'GREETINGS_GORDON_FREEMAN' => "Hello, %s %s,\n",
422422
'GREETINGS' => "Hello,\n",
423-
'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",
423+
'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",
424424

425425
'FTP login credentials' => 'FTP login credentials',
426-
'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",
426+
'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",
427427

428428
'Database Credentials' => 'Database Credentials',
429429
'DATABASE_READY' => "Database has been created successfully.\n\nDatabase: %s\nUser: %s\nPassword: %s\n%s\n\n--\nVesta Control Panel\n",

0 commit comments

Comments
 (0)