Merge branch 'patch-5' of https://github.com/rumi55/vesta into rumi55-patch-5

Conflicts:
	web/inc/i18n/bs.php

web/inc/i18n/bs.php

@@ -26,18 +26,18 @@ $LANG['bs'] = array(
     'BACKUP'  => 'BACKUP',
 
     'LOGIN'  => 'LOGIN',
-    'RESET PASSWORD'  => 'RESET PASSWORD',
+    'RESET PASSWORD'  => 'PROMJENA ŠIFRE',
-    'SEARCH'  => 'SEARCH',
+    'SEARCH'  => 'PRETRAGA',
-    'PACKAGE'  => 'PACKAGE',
+    'PACKAGE'  => 'PAKET',
     'RRD'  => 'RRD',
-    'STATS'  => 'STATS',
+    'STATS'  => 'STATISTIKA',
     'LOG'  => 'LOG',
-    'UPDATES'  => 'UPDATES',
+    'UPDATES'  => 'AŽURIRANJA',
     'FIREWALL'  => 'FIREWALL',
     'SERVER'  => 'SERVER',
-    'MEMORY'  => 'MEMORY',
+    'MEMORY'  => 'MEMORIJA',
     'DISK'  => 'DISK',
-    'NETWORK'  => 'NETWORK',
+    'NETWORK'  => 'MREŠA',
     'Web Log Manager'  => 'Web Log Manager',
 
     'Add User'  => 'Dodaj korisnika',
@@ -54,8 +54,8 @@ $LANG['bs'] = array(
     'Restore All'  => 'Vrati sve',
     'Add Package'  => 'Dodaj paket',
     'Add IP'  => 'Dodaj IP',
-    'Add Rule' => 'Add Rule',
+    'Add Rule' => 'Dodati pravilo',
-    'Ban IP Address' => 'Ban IP Address',
+    'Ban IP Address' => 'Zabrani IP adresu',
     'Search'  => 'Traži',
     'Add one more FTP Account' => 'Dodaj još jednu FTP račun',
     'Overall Statistics'  => 'Globalna statistika',
@@ -240,13 +240,13 @@ $LANG['bs'] = array(
     'Users'  => 'Korisnici',
     'Load Average'  => 'Prosječno opterećenje',
     'Memory Usage'  => 'Upotreba memorije',
-    'APACHE2 Usage'  => 'APACHE2 Usage',
+    'APACHE2 Usage'  => 'APACHE2 upotreba',
     'HTTPD Usage'  => 'HTTPD upotreba',
     'NGINX Usage'  => 'NGINX upotreba',
     'MySQL Usage on localhost'  => 'MySQL na localhostu',
     'PostgreSQL Usage on localhost'  => 'PostgreSQL na  localhostu',
     'Bandwidth Usage eth0'  => 'Bandwidth na eth0',
-    'Exim Usage'  => 'Exim Usage',
+    'Exim Usage'  => 'Exim upotreba',
     'FTP Usage'  => 'FTP upotreba',
     'SSH Usage'  => 'SSH upotreba',
     'reverse proxy'  => 'preokrenut proxy',
@@ -381,7 +381,7 @@ $LANG['bs'] = array(
     'Banlist' => 'Lista banovanih',
     'ranges are acceptable' => 'rasponi su prihvatljivi',
     'CIDR format is supported' => 'CIDR format je podržan',
-    'ACCEPT' => 'ACCEPT',
+    'ACCEPT' => 'PRIHVATITI',
     'DROP' => 'DROP',
     'TCP' => 'TCP',
     'UDP' => 'UDP',
@@ -389,19 +389,19 @@ $LANG['bs'] = array(
     'SSH' => 'SSH',
     'FTP' => 'FTP',
     'VESTA' => 'VESTA',
-    'Add one more Name Server' => 'Add one more Name Server',
+    'Add one more Name Server' => 'Dodati još jedan Name server',
 
-    'web domain' => 'web domain',
+    'web domain' => 'web domena',
-    'dns domain' => 'dns domain',
+    'dns domain' => 'dns domena',
-    'dns record' => 'dns record',
+    'dns record' => 'dns zapis',
-    'mail domain' => 'mail domain',
+    'mail domain' => 'mail domena',
-    'mail account' => 'mail account',
+    'mail account' => 'mail račun',
     'cron job' => 'cron job',
 
     'cron' => 'cron',
-    'user dir' => 'user dir',
+    'user dir' => 'korisnički dir',
 
-    'unlimited'  => 'unlimited',
+    'unlimited'  => 'neograničeno',
     '1 account'  => '1 račun',
     '%s accounts'  => '%s računa',
     '1 domain'  => '1 domena',
@@ -445,7 +445,7 @@ $LANG['bs'] = array(
     'PACKAGE_CREATED_OK'  => 'Paket <a href="/edit/package/?package=%s"><b>%s</b></a> je uspješno napravljen.',
     'SSL_GENERATED_OK' => 'Certifikat je uspješno generisan.',
     'RULE_CREATED_OK' => 'Pravilo je uspješno kreiran.',
-    'BANLIST_CREATED_OK' => 'IP address has been banned successfully',    // I'm not sure about this text
+    'BANLIST_CREATED_OK' => 'IP adresa je uspješno zabranjena',    // I'm not sure about this text
     'Autoupdate has been successfully enabled' => 'Automatsko ažuriranje uspješno omogućeno',
     'Autoupdate has been successfully disabled' => 'Automatsko ažuriranje je onemogućeno',
     'Cronjob email reporting has been successfully enabled' => 'Cronjob izvještavanje je uspješno omogućen',
@@ -477,7 +477,7 @@ $LANG['bs'] = array(
     'DELETE_RULE_CONFIRMATION' => 'Da li ste sigurni da želite obrisati pravilo #%s?',
     'SUSPEND_RULE_CONFIRMATION' => 'Da li ste sigurni da želite obustaviti pravilo  #%s?',
     'UNSUSPEND_RULE_CONFIRMATION' => 'Da li ste sigurni da želite ponovo vratiti pravilo #%s?',
-    'LEAVE_PAGE_CONFIRMATION' => 'Leave Page?',
+    'LEAVE_PAGE_CONFIRMATION' => 'Napusti stranicu?',
     'RESTART_CONFIRMATION' => 'Da li ste sigurni da želite ponovno pokretanje %s?',
     'Welcome'  => 'Dobrodošli',
     'LOGGED_IN_AS'  => 'Ušli ste kao %s',
@@ -557,48 +557,48 @@ $LANG['bs'] = array(
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'PostgreSQL Support',
     'phpPgAdmin URL' => 'phpPgAdmin URL',
-    'Maximum Number Of Databases' => 'Maximum Number Of Databases',
+    'Maximum Number Of Databases' => 'Maksimalan broj baza',
-    'Current Number Of Databases' => 'Current Number Of Databases',
+    'Current Number Of Databases' => 'Trenutačan broj baza',
-    'Local backup' => 'Local backup',
+    'Local backup' => 'Lokalni backup',
-    'Compression level' => 'Compression level',
+    'Compression level' => 'Nivo sažimanja',
-    'Directory' => 'Directory',
+    'Directory' => 'Direktorij',
     'Remote backup' => 'Remote backup',
     'ftp' => 'FTP',
     'sftp' => 'SFTP',
     'SFTP Chroot' => 'SFTP Chroot',
     'FileSystem Disk Quota' => 'FileSystem Disk Quota',
-    'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins',
+    'Vesta Control Panel Plugins' => 'Vesta kontrolni panel Plugini',
     'preview' => 'pregled',
-    'Reseller Role' => 'Reseller Role',
+    'Reseller Role' => 'Reseller uloga',
     'Web Config Editor' => 'Web Config Editor',
     'Template Manager' => 'Template Manager',
     'Backup Migration Manager' => 'Backup Migration Manager',
     'FileManager' => 'FileManager',
-    'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK',
+    'show: CPU / MEM / NET / DISK' => 'prikaz: CPU / MEM / NET / DISK',
 
-    'sort by' => 'sort by',
+    'sort by' => 'sortiranje po',
     'Date' => 'Datum',
-    'Starred' => 'Starred',
+    'Starred' => 'Označen zvjezdicom',
-    'Name' => 'Name',
+    'Name' => 'Ime',
 
 
     'File Manager' => 'File Manager',
-    'size' => 'size',
+    'size' => 'veličina',
-    'date' => 'date',
+    'date' => 'datum',
-    'name' => 'name',
+    'name' => 'ime',
-    'Initializing' => 'Initializing',
+    'Initializing' => 'Inicijalizacija',
     'UPLOAD' => 'UPLOAD',
-    'NEW FILE' => 'NEW FILE',
+    'NEW FILE' => 'NOVI FAJL',
-    'NEW DIR' => 'NEW DIR',
+    'NEW DIR' => 'NOVI DIREKTORIJ',
-    'DELETE' => 'DELETE',
+    'DELETE' => 'IZBRISATI',
-    'RENAME' => 'RENAME',
+    'RENAME' => 'PREIMENOVATI',
     'MOVE' => 'MOVE',
-    'RIGHTS' => 'RIGHTS',
+    'RIGHTS' => 'PRAVA',
-    'COPY' => 'COPY',
+    'COPY' => 'KOPIRATI',
-    'ARCHIVE' => 'ARCHIVE',
+    'ARCHIVE' => 'ARHIVIRATI',
-    'EXTRACT' => 'EXTRACT',
+    'EXTRACT' => 'EKSTRAKTOVATI',
-    'DOWNLOAD' => 'DOWNLOAD',
+    'DOWNLOAD' => 'PREUZETI',
-    'Are you sure?' => 'Are you sure?',    // unused?
+    'Are you sure?' => 'Da li ste sigurni?',    // unused?
     'Hit' => 'Hit',
     'to reload the page' => 'to reload the page',
     'Directory name cannot be empty' => 'Directory name cannot be empty',
@@ -614,29 +614,28 @@ $LANG['bs'] = array(
     'Cancel' => 'Odustati',
     'Rename' => 'Izmijeniti',
     'Move' => 'Move',
-    'Change Rights' => 'Change Rights',
+    'Change Rights' => 'Promjena pravila',
     'Delete' => 'Izbrisati',
     'Extract' => 'Ekstraktovati',
     'Create' => 'Napraviti',
     'Compress' => 'Kompresovati',
     'OK' => 'OK',
-    'YOU ARE COPYING' => 'YOU ARE COPYING',    // unused?
+    'YOU ARE COPYING' => 'VRŠI SE KOPIRANJE',    // unused?
-    'YOU ARE REMOVING' => 'YOU ARE REMOVING',
+    'YOU ARE REMOVING' => 'VRŠI SE PREBACIVANJE',
-    'Delete items' => 'Delete items',
+    'Delete items' => 'Brisanje svih stavki',
-    'Copy files' => 'Copy files',
+    'Copy files' => 'Kopiranje fajlova',
     'Move files' => 'Move files',
-    'Are you sure you want to copy' => 'Are you sure you want to copy',
+    'Are you sure you want to copy' => 'Da li ste sigurni da želite kopirati',
-    'Are you sure you want to move' => 'Are you sure you want to move',
+    'Are you sure you want to delete' => 'Da li ste sigurni da želite izbrisati',
-    'Are you sure you want to delete' => 'Are you sure you want to delete',
+    'into' => 'u',
-    'into' => 'into',
+    'existing files will be replaced' => 'postojeći fajlovi će biti zamijenjeni',
-    'existing files will be replaced' => 'existing files will be replaced',
+    'Original name' => 'Orginalno ime',
-    'Original name' => 'Original name',
+    'File' => 'Fajl',
-    'File' => 'File',
+    'already exists' => 'Već postoji',
-    'already exists' => 'already exists',
+    'Create file' => 'Napraviti fajl',
-    'Create file' => 'Create file',
+    'Create directory' => 'Napraviti direktorij',
-    'Create directory' => 'Create directory',
+    'read by owner' => 'mogućnost čitanja od strane vlasnika',
-    'read by owner' => 'read by owner',
+    'write by owner' => 'mogućnost zapisa od strane vlasnika',
-    'write by owner' => 'write by owner',
     'execute/search by owner' => 'execute/search by owner',
     'read by group' => 'read by group',
     'write by group' => 'write by group',
@@ -645,10 +644,10 @@ $LANG['bs'] = array(
     'write by others' => 'write by others',
     'execute/search by others' => 'execute/search by others',
 
-    'Shortcuts' => 'Shortcuts',
+    'Shortcuts' => 'Prečice',
-    'Add New object' => 'Add New object',
+    'Add New object' => 'Dodati novi objekat',
-    'Save Form' => 'Save Form',
+    'Save Form' => 'Sačuvati',
-    'Cancel saving form' => 'Cancel saving form',
+    'Cancel saving form' => 'Odustani',
     'Go to USER list' => 'Go to USER list',
     'Go to WEB list' => 'Go to WEB list',
     'Go to DNS list' => 'Go to DNS list',
@@ -688,43 +687,42 @@ $LANG['bs'] = array(
     'shortcuts are inspired by magnificent GNU <a href="https://www.midnight-commander.org/">Midnight Commander</a> file manager' =>
         'shortcuts are inspired by magnificent GNU <a href="https://www.midnight-commander.org/">Midnight Commander</a> file manager',
 
-    'Licence Key' => 'Licence Key',
+    'Licence Key' => 'Licencni ključ',
-    'Enter License Key' => 'Enter License Key',
+    'Enter License Key' => 'Unesi ključ licence',
-    'Buy Licence' => 'Buy Licence',
+    'Buy Licence' => 'Kupi licencu',
     'Buy Lifetime License' => 'Buy Lifetime License',
     'Disable and Cancel Licence' => 'Disable and Cancel Licence',
-    'Licence Activated' => 'Licence Activated',
+    'Licence Activated' => 'Licenca je aktivirana',
     'Licence Deactivated' => 'Licence Deactivated',
     'Restrict users so that they cannot use SSH and access only their home directory.' => 'Restrict users so that they cannot use SSH and access only their home directory.',
     'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.',
     'This is a commercial module, you would need to purchace license key to enable it.' => 'This is a commercial module, you would need to purchace license key to enable it.',
 
-    'Minutes' => 'Minutes',
+    'Minutes' => 'Minuta',
-    'Hourly' => 'Hourly',
+    'Hourly' => 'Sahati',
-    'Run Command' => 'Run Command',
+    'Run Command' => 'Pokreni komandu',
     'every month' => 'every month',
     'every odd month' => 'every odd month',
     'every even month' => 'every even month',
-    'every day' => 'every day',
+    'every day' => 'svaki dan',
-    'every odd day' => 'every odd day',
+    'every odd day' => 'svaki neparan dan',
     'every even day' => 'every even day',
     'weekdays (5 days)' => 'weekdays (5 days)',
     'weekend (2 days)' => 'weekend (2 days)',
-    'Monday' => 'Monday',
+    'Monday' => 'Ponedjeljak',
-    'Tuesday' => 'Tuesday',
+    'Tuesday' => 'Utorak',
-    'Wednesday' => 'Wednesday',
+    'Wednesday' => 'Srijeda',
-    'Thursday' => 'Thursday',
+    'Thursday' => 'Četvrtak',
-    'Friday' => 'Friday',
+    'Friday' => 'Petak',
-    'Saturday' => 'Saturday',
+    'Saturday' => 'Subota',
-    'Sunday' => 'Sunday',
+    'Sunday' => 'Nedjelja',
-    'every hour' => 'every hour',
+    'every hour' => 'svaki sahat',
-    'every two hours' => 'every two hours',
+    'every two hours' => 'svako dva sahata',
-    'every minute' => 'every minute',
+    'every minute' => 'svake minute',
-    'every two minutes' => 'every two minutes',
+    'every two minutes' => 'svake dvije minute',
-    'every' => 'every',
+    'every' => 'svakih',
-    'Generate' => 'Generate',
+    'Generate' => 'Generiši',
 
     'webalizer' => 'webalizer',
     'awstats' => 'awstats',
-
 );