diff --git a/web/inc/i18n/fi.php b/web/inc/i18n/fi.php
index 0b9f74462..c0b4b0b35 100644
--- a/web/inc/i18n/fi.php
+++ b/web/inc/i18n/fi.php
@@ -1,38 +1,18 @@
>>>>>> d2e973e54b22c385d0c365d400330a52d84a165c
* RJuho (juho.rasanen@kotikone.fi)
*/
$LANG['fi'] = array(
'Packages' => 'Paketit',
'IP' => 'IP',
-<<<<<<< HEAD
- 'Graphs' => 'Kaaviot',
-=======
'Graphs' => 'Kuvaajat',
->>>>>>> d2e973e54b22c385d0c365d400330a52d84a165c
'Statistics' => 'Tilastot',
'Log' => 'Loki',
'Services' => 'Palvelut',
'Updates' => 'Päivitykset',
-<<<<<<< HEAD
- 'Log in' => 'Kirjaudu sisään',
- 'Log out' => 'Kirjaudu ulos',
-
- 'USER' => 'KAYTTÄJÄ',
- 'WEB' => 'WEB',
- 'DNS' => 'DNS',
- 'MAIL' => 'EMAIL',
- 'DB' => 'DB',
- 'CRON' => 'CRON',
- 'BACKUP' => 'VARMUUSKOPIOT',
-=======
'Log in' => 'Kirjaudu',
'Log out' => 'Kirjaudu ulos',
@@ -43,7 +23,6 @@ $LANG['fi'] = array(
'DB' => 'DB',
'CRON' => 'CRON',
'BACKUP' => 'BACKUP',
->>>>>>> d2e973e54b22c385d0c365d400330a52d84a165c
'Add User' => 'Lisää käyttäjä',
'Add Domain' => 'Lisää domaini',
@@ -53,30 +32,18 @@ $LANG['fi'] = array(
'Add Mail Domain' => 'Lisää email domain',
'Add Mail Account' => 'Lisää email käyttäjä',
'Add Database' => 'Lisää tietokanta',
-<<<<<<< HEAD
- 'Add Cron Job' => 'Lisää Cron ajoitus',
-=======
'Add Cron Job' => 'Lisää Cron-tehtävä',
->>>>>>> d2e973e54b22c385d0c365d400330a52d84a165c
'Create Backup' => 'Luo varmuuskopio',
'Configure' => 'Määritä',
'Restore All' => 'Palauta kaikki',
'Add Package' => 'Lisää paketti',
'Add IP' => 'Lisää IP',
'Search' => 'Haku',
-<<<<<<< HEAD
- 'Overall Statistics' => 'Yleiset tilastot',
- 'Daily' => 'Päivittäin',
- 'Weekly' => 'Viikottain',
- 'Monthly' => 'Kuukausittain',
- 'Yearly' => 'Vuosittain',
-=======
'Overall Statistics' => 'Kokonaistilastot',
'Daily' => 'Päivä',
'Weekly' => 'Viikko',
'Monthly' => 'Kuukausi',
'Yearly' => 'Vuosi',
->>>>>>> d2e973e54b22c385d0c365d400330a52d84a165c
'Add' => 'Lisää',
'Back' => 'Takaisin',
'Save' => 'Tallenna',
@@ -87,23 +54,6 @@ $LANG['fi'] = array(
'rebuild' => 'palauta',
'rebuild web' => 'palauta web',
'rebuild dns' => 'palauta dns',
-<<<<<<< HEAD
- 'rebuild mail' => 'palauta email',
- 'rebuild db' => 'palauta db',
- 'rebuild cron' => 'palauta cron',
- 'update counters' => 'päivitä laskurit',
- 'suspend' => 'keskeytä',
- 'unsuspend' => 'älä keskeytä',
- 'delete' => 'poista',
- 'show per user' => 'näytä per käyttäjä',
- 'login as' => 'kirjautunut',
- 'logout' => 'kirjaudu ulos',
- 'edit' => 'muokkaa',
- 'open webstats' => 'avaa web tilastot',
- 'view logs' => 'näytä lokit',
- 'list records' => 'list %s records', //think
- 'add record' => 'add record', //think
-=======
'rebuild mail' => 'palauta sähköposti',
'rebuild db' => 'palauta tietokanta',
'rebuild cron' => 'palauta cron',
@@ -119,31 +69,20 @@ $LANG['fi'] = array(
'view logs' => 'näytä lokit',
'list records' => 'listaa %s tietuetta',
'add record' => 'lisää tietue',
->>>>>>> d2e973e54b22c385d0c365d400330a52d84a165c
'list accounts' => 'listaa %s käyttäjää',
'add account' => 'lisää käyttäjä',
'open webmail' => 'avaa webmail',
'open %s' => 'avaa %s',
'download' => 'lataa',
'restore' => 'palauta',
-<<<<<<< HEAD
- 'configure restore settings' => 'määritä palautus asetukset',
- 'stop' => 'pysäytä',
- 'start' => 'aloita',
-=======
'configure restore settings' => 'määritä palautusasetukset',
'stop' => 'pysäytä',
'start' => 'käynnistä',
->>>>>>> d2e973e54b22c385d0c365d400330a52d84a165c
'restart' => 'käynnistä uudelleen',
'update' => 'päivitä',
'generate' => 'generoi',
'Generate CSR' => 'generoi CSR',
-<<<<<<< HEAD
- 'reread IP' => 'reread IP', //think
-=======
'reread IP' => 'lue IP uudelleen',
->>>>>>> d2e973e54b22c385d0c365d400330a52d84a165c
'enable autoupdate' => 'päivitä automaattisesti',
'disable autoupdate' => 'älä päivitä automaattisesti',
@@ -151,28 +90,6 @@ $LANG['fi'] = array(
'Editing User' => 'Muokataan käyttäjää',
'Adding Domain' => 'Lisätään domainia',
'Editing Domain' => 'Muokataan domainia',
-<<<<<<< HEAD
- 'Adding DNS Domain' => 'Lisätään DNS domainia',
- 'Editing DNS Domain' => 'Muokataan DNS domainia',
- 'Adding DNS Record' => 'Lisätään DNS asetusta',
- 'Editing DNS Record' => 'Muokataan DNS asetusta',
- 'Adding Mail Domain' => 'Lisätään email domainia',
- 'Editing Mail Domain' => 'Muokataan email domainia',
- 'Adding Mail Account' => 'Lisätään email käyttäjää',
- 'Editing Mail Account' => 'Muokataan email läyttäjää',
- 'Adding database' => 'Lisätään tietokantaa',
- 'Editing Cron Job' => 'Muokataan Cron tehtävää',
- 'Adding Cron Job' => 'Lisätään Cron tehtävää',
- 'Editing Database' => 'Muokataan tietokantaa',
- 'Adding Package' => 'Lisätään pakettia',
- 'Editing Package' => 'Muokataan pakettia',
- 'Adding IP address' => 'Lisätään IP osoitetta',
- 'Editing IP Address' => 'Muokataan IP osoitetta',
- 'Editing Backup Exclusions' => 'Editing Backup Exclusions', //think
- 'Generating CSR' => 'Generoidaan CSR',
- 'Listing' => 'Listataan',
- 'Search Results' => 'Haku tulokset',
-=======
'Adding DNS Domain' => 'Lisätään DNS-domainia',
'Editing DNS Domain' => 'Muokataan DNS-domainia',
'Adding DNS Record' => 'Lisätään DNS-tietuetta',
@@ -193,7 +110,6 @@ $LANG['fi'] = array(
'Generating CSR' => 'Generoidaan CSR',
'Listing' => 'Listataan',
'Search Results' => 'Hakutulokset',
->>>>>>> d2e973e54b22c385d0c365d400330a52d84a165c
'active' => 'aktiivinen',
'spnd' => 'keskeytetty',
@@ -206,326 +122,6 @@ $LANG['fi'] = array(
'yes' => 'kyllä',
'no' => 'ei',
'none' => 'ei mitään',
-<<<<<<< HEAD
- 'pb' => 'pb', //?
- 'tb' => 'tb', //?
- 'gb' => 'gb', //?
- 'mb' => 'mb', //?
- 'minute' => 'minuutti',
- 'hour' => 'tunti',
- 'day' => 'päivä',
- 'days' => 'päivät',
- 'hours' => 'tunnit',
- 'minutes' => 'minuutit',
- 'month' => 'kuukausi',
- 'package' => 'paketti',
- 'Bandwidth' => 'Kaistanleveys',
- 'Disk' => 'Levy',
- 'Web' => 'Web',
- 'Mail' => 'EMail',
- 'Databases' => 'Tietokannat',
- 'User Directories' => 'Käyttäjähakemistot',
- 'Template' => 'Teema',
- 'Web Template' => 'Apache teema',
- 'Proxy Template' => 'Nginx teema',
- 'DNS Template' => 'DNS teema',
- 'Web Domains' => 'Web domainit',
- 'SSL Domains' => 'SSL domainit',
- 'Web Aliases' => 'Web aliakset',
- 'per domain' => 'per domaini',
- 'DNS domains' => 'DNS domainit',
- 'DNS domains' => 'DNS domainit',
- 'DNS records' => 'DNS records' , //think
- 'Name Servers' => 'Nimipalvelimet',
- 'Mail Domains' => 'EMail Domainit',
- 'Mail Accounts' => 'EMail käyttäjät',
- 'Cron Jobs' => 'Cron tehtävät',
- 'SSH Access' => 'SSH oikeudet',
- 'IP Addresses' => 'IP osoitteet',
- 'Backups' => 'Varmuuskopiot',
- 'Backup System' => 'Backup järjestelmä',
- 'backup exclusions' => 'varmuuskopio poikkeukset',
- 'template' => 'teema',
- 'SSL Support' => 'SSL tuki',
- 'SSL Home Directory' => 'SSL koti',
- 'Proxy Support' => 'Nginx tuki',
- 'Proxy Extensions' => 'Nginx laajennukset',
- 'Web Statistics' => 'Web tilastot',
- 'Additional FTP Account' => 'Ylimääräinen FTP',
- 'SOA' => 'SOA',
- 'TTL' => 'TTL',
- 'Expire' => 'Päättyy',
- 'Records' => 'Merkinnät', //ready
- 'Catchall email' => 'Catchall email',
- 'AntiVirus Support' => 'AntiVirus Support',
- 'AntiSpam Support' => 'AntiSpam Support',
- 'DKIM Support' => 'DKIM Support',
- 'Accounts' => 'Accounts',
- 'Quota' => 'Quota',
- 'Autoreply' => 'Autoreply',
- 'Forward to' => 'Forward to',
- 'Do not store forwarded mail' => 'Do not store forwarded mail',
- 'database' => 'database',
- 'User' => 'User',
- 'Host' => 'Host',
- 'Charset' => 'Charset',
- 'Min' => 'Min',
- 'Hour' => 'Hour',
- 'Day' => 'Day',
- 'Month' => 'Month',
- 'Day of week' => 'Day of week',
- 'local' => 'local',
- 'Run Time' => 'Run Time',
- 'Backup Size' => 'Backup Size',
- 'SYS' => 'SYS',
- 'Domains' => 'Domains',
- 'Status' => 'Status',
- 'shared' => 'shared',
- 'dedicated' => 'dedicated',
- 'Owner' => 'Owner',
- 'Users' => 'Users',
- 'Load Average' => 'Load Average',
- 'Memory Usage' => 'Memory Usage',
- 'HTTPD Usage' => 'HTTPD Usage',
- 'NGINX Usage' => 'NGINX Usage',
- 'MySQL Usage on localhost' => 'MySQL Usage on localhost',
- 'PostgreSQL Usage on localhost' => 'PostgreSQL Usage on localhost',
- 'Bandwidth Usage eth0' => 'Bandwidth Usage eth0',
- 'FTP Usage' => 'FTP Usage',
- 'SSH Usage' => 'SSH Usage',
- 'reverse proxy' => 'reverse proxy',
- 'web server' => 'web server',
- 'dns server' => 'dns server',
- 'mail server' => 'mail server',
- 'pop/imap server' => 'pop/imap server',
- 'email antivirus' => 'email antivirus',
- 'email antispam' => 'email antispam',
- 'database server' => 'database server',
- 'ftp server' => 'ftp server',
- 'job scheduler' => 'job scheduler',
- 'CPU' => 'CPU',
- 'Memory' => 'Memory',
- 'Uptime' => 'Uptime',
- 'core package' => 'core package',
- 'php interpreter' => 'php interpreter',
- 'internal web server' => 'internal web server',
- 'Version' => 'Version',
- 'Release' => 'Release',
- 'Architecture' => 'Architecture',
- 'Object' => 'Object',
- 'Owner' => 'Owner',
- 'Username' => 'Username',
- 'Password' => 'Password',
- 'Email' => 'Email',
- 'Package' => 'Package',
- 'Language' => 'Language',
- 'First Name' => 'First Name',
- 'Last Name' => 'Last Name',
- 'Send login credentials to email address' => 'Send login credentials to email address',
- 'Default Template' => 'Default Template',
- 'Default Name Servers' => 'Default Name Servers',
- 'Domain' => 'Domain',
- 'DNS Support' => 'DNS Support',
- 'Mail Support' => 'Mail Support',
- 'Advanced options' => 'Advanced options',
- 'Aliases' => 'Aliases',
- 'SSL Certificate' => 'SSL Certificate',
- 'SSL Key' => 'SSL Key',
- 'SSL Certificate Authority / Intermediate' => 'SSL Certificate Authority / Intermediate',
- 'SSL CSR' => 'SSL CSR',
- 'optional' => 'optional',
- 'internal' => 'internal',
- 'Statistics Authorization' => 'Statistics Authorization',
- 'Statistics Auth' => 'Statistics Auth',
- 'Account' => 'Account',
- 'Prefix will be automaticaly added to username' => 'Prefix %s will be automaticaly added to username',
- 'Send FTP credentials to email' => 'Send FTP credentials to email',
- 'Expiration Date' => 'Expiration Date',
- 'YYYY-MM-DD' => 'YYYY-MM-DD',
- 'Name servers' => 'Name servers',
- 'Record' => 'Record',
- 'IP or Value' => 'IP or Value',
- 'Priority' => 'Priority',
- 'Record Number' => 'Record Number',
- 'in megabytes' => 'in megabytes',
- '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',
- 'Database' => 'Database',
- 'Type' => 'Type',
- 'Minute' => 'Minute',
- 'Command' => 'Command',
- 'Package Name' => 'Package Name',
- 'Netmask' => 'Netmask',
- 'Interface' => 'Interface',
- 'Shared' => 'Shared',
- 'Assigned user' => 'Assigned user',
- 'Assigned domain' => 'Assigned domain',
- 'NAT IP association' => 'NAT IP association',
- 'shell' => 'shell',
- 'web domains' => 'web domains',
- 'web aliases' => 'web aliases',
- 'dns records' => 'dns records',
- 'mail domains' => 'mail domains',
- 'mail accounts' => 'mail accounts',
- 'accounts' => 'accounts',
- 'databases' => 'databases',
- 'cron jobs' => 'cron jobs',
- 'backups' => 'backups',
- 'quota' => 'quota',
- 'day of week' => 'day of week',
- 'cmd' => 'cmd',
- 'users' => 'users',
- 'domains' => 'domains',
- 'aliases' => 'aliases',
- 'records' => 'records',
- 'jobs' => 'jobs',
- 'username' => 'username',
- 'password' => 'password',
- 'type' => 'type',
- 'charset' => 'charset',
- 'domain' => 'domain',
- 'ip' => 'ip',
- 'ip address' => 'ip address',
- 'IP address' => 'IP address',
- 'netmask' => 'netmask',
- 'interface' => 'interface',
- 'assigned user' => 'assigned user',
- 'ns1' => 'ns1',
- 'ns2' => 'ns2',
- 'user' => 'user',
- 'email' => 'email',
- 'first name' => 'first name',
- 'last name' => 'last name',
- 'account' => 'account',
- 'ssl certificate' => 'ssl certificate',
- 'ssl key' => 'ssl key',
- 'stats user password' => 'stats user password',
- 'stats username' => 'stats username',
- 'stats password' => 'stats password',
- 'ftp user password' => 'ftp user password',
- 'ftp user' => 'ftp user',
- 'Last 70 lines of %s.%s.log' => 'Last 70 lines of %s.%s.log',
- 'Download AccessLog' => 'Download AccessLog',
- 'Download ErrorLog' => 'Download ErrorLog',
- 'Country' => 'Country',
- '2 letter code' => '2 letter code',
- 'State / Province' => 'State / Province',
- 'City / Locality' => 'City / Locality',
- 'Organization' => 'Organization',
-
- '1 account' => '1 account',
- '%s accounts' => '%s accounts',
- '1 domain' => '1 domain',
- '%s domains' => '%s domains',
- '1 record' => '1 record',
- '%s records' => '%s records',
- '1 mail account' => '1 mail account',
- '%s mail accounts' => '%s mail accounts',
- '1 database' => '1 database',
- '%s databases' => '%s databases',
- '1 cron job' => '1 cron job',
- '%s cron jobs' => '%s cron jobs',
- '1 archive' => '1 archive',
- '%s archives' => '%s archives',
- '1 package' => '1 package',
- '%s packages' => '%s packages',
- '1 IP address' => '1 IP address',
- '%s IP addresses' => '%s IP addresses',
- '1 month' => '1 month',
- '%s months' => '%s months',
- '1 log record' => '1 log record',
- '%s log records' => '%s log records',
- '1 object' => '1 object',
- '%s objects' => '%s objects',
- 'no exclusions' => 'no exclusions',
-
- 'USER_CREATED_OK' => 'User %s has been created successfully',
- 'WEB_DOMAIN_CREATED_OK' => 'Domain %s has been created successfully.',
- 'DNS_DOMAIN_CREATED_OK' => 'DNS domain %s has been created successfully.',
- 'DNS_RECORD_CREATED_OK' => 'Record %s.%s has been created successfully.',
- 'MAIL_DOMAIN_CREATED_OK' => 'Mail domain %s has been created successfully.',
- 'MAIL_ACCOUNT_CREATED_OK' => 'Mail account %s@%s has been created successfully',
- 'DATABASE_CREATED_OK' => 'Database %s has been created successfully',
- 'CRON_CREATED_OK' => 'Cron job has been created successfully.',
- 'IP_CREATED_OK' => 'IP address %s has been created successfully.',
- 'PACKAGE_CREATED_OK' => 'Package %s 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.',
- '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?',
- '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.',
- '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',
- 'SERVICE_ACTION_FAILED' => '"%s" "%s" failed',
- '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_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",
- 'DNS_EXCLUSIONS' => "Type domain name, one per line. To exclude all domains use *",
- 'MAIL_EXCLUSIONS' => "Type domain name, one per line. To exclude all domains use *. To exclude specific accounts use following format: domain.com:info:support:postmaster",
- 'DB_EXCLUSIONS' => "Type full database name, one per line. To exclude all databases use *",
- 'CRON_EXCLUSIONS' => "To exclude all jobs use *",
- 'USER_EXCLUSIONS' => "Type directory name, one per line. To exlude all dirs use *",
-
- 'Welcome to Vesta Control Panel' => 'Welcome to Vesta Control Panel',
- 'MAIL_FROM' => 'Vesta Control Panel ',
- '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",
-
- '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",
-
- '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",
-
- 'forgot password' => 'forgot password',
- 'Confirm' => 'Confirm',
- 'New Password' => 'New Password',
- 'Confirm Password' => 'Confirm Password',
- 'Reset' => 'Reset',
- 'Reset Code' => 'Reset Code',
- 'RESET_NOTICE' => '',
- 'RESET_CODE_SENT' => 'Password reset code has been sent to your email address
',
- 'MAIL_RESET_SUBJECT' => 'Password Reset at %s',
- 'PASSWORD_RESET_REQUEST' => "To reset your control panel password, please follow this link:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternatively, you may go to https://%s/reset/?action=code&user=%s and enter the following reset code:\n%s\n\nIf you did not request password reset, please ignore this message and accept our apologies.\n\n--\nVesta Control Panel\n",
-);
-=======
'pb' => 'pb', //petatavu
'tb' => 'tb', //teratavu
'gb' => 'gb', //gigatavu
@@ -847,4 +443,3 @@ $LANG['fi'] = array(
'MAIL_RESET_SUBJECT' => 'Salana vaihdettiin %s',
'PASSWORD_RESET_REQUEST' => "Nollataksesi hallintapaneelin salasanan, seuraa tätä linkkiä:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nVaihtoehtoisesti voit mennä https://%s/reset/?action=code&user=%s ja syöttää nollauskoodin:\n%s\n\nJos et varta vasten pyytänyt tätä salasananvaihtoa, mene paniikkiin ja ota yhteyttä ylläpitoon.\n\n--\nVesta Hallintapaneeli\n",
);
->>>>>>> d2e973e54b22c385d0c365d400330a52d84a165c