diff --git a/messages/sk/base.php b/messages/sk/base.php
index 3fb1df1..3c51c44 100644
--- a/messages/sk/base.php
+++ b/messages/sk/base.php
@@ -1,100 +1,99 @@
 <?php
-
-return [
-    'Close' => '닫기',
-    '%filename% has invalid extension and was skipped.' => '',
-    '/ (root)' => '',
-    '<strong>Confirm</strong> delete file' => '',
-    '<strong>Create</strong> folder' => '',
-    '<strong>Edit</strong> file' => '',
-    '<strong>Edit</strong> folder' => '',
-    '<strong>File</strong> download url' => '',
-    '<strong>File</strong> url' => '',
-    '<strong>File</strong> versions' => '',
-    '<strong>Files</strong> module configuration' => '',
-    '<strong>Folder</strong> url' => '',
-    '<strong>Move</strong> files' => '',
-    'A file with that name already exists in this folder.' => '',
-    'Actions' => '',
-    'Add directory' => '',
-    'Add file(s)' => '',
-    'Adds files module to this space.' => '',
-    'Adds files module to your profile.' => '',
-    'An error occurred while creating folder {folder}.' => '',
-    'An error occurred while unpacking {filename}.' => '',
-    'Archive %filename% could not be extracted.' => '',
-    'Author' => '',
-    'Cannot edit non existing file.' => '',
-    'Could not find folder with id: %id%' => '',
-    'Could not move the item!' => '',
-    'Creator' => '',
-    'Delete' => '',
-    'Delete this version!' => '',
-    'Destination folder not found!' => '',
-    'Disable archive (ZIP) support' => '',
-    'Display Url' => '',
-    'Display a download count column' => '',
-    'Do you really want to delete this {number} item(s) with all subcontent?' => '',
-    'Download' => '',
-    'Download ZIP' => '',
-    'Downloads' => '',
-    'Edit' => '',
-    'Edit directory' => '',
-    'File' => '',
-    'File "{movedItemName}" has been moved into the folder "{targetFolderName}".' => '',
-    'File {fileName} has been reverted to version from {fileDateTime}' => '',
-    'Files' => '',
-    'Files from the stream' => '',
-    'Folder' => '',
-    'Folder "{movedItemName}" has been moved into the folder "{targetFolderName}".' => '',
-    'Folder should not start or end with blank space.' => '',
-    'Folder {name} can\'t be moved to itself!' => '',
-    'Folder {name} given folder is not editable!' => '',
-    'Import Zip' => '',
-    'Likes/Comments' => '',
-    'Make Private' => '',
-    'Make Public' => '',
-    'Move' => '',
-    'Move to another Space' => '',
-    'Moving to the same folder is not valid.' => '',
-    'Moving to this folder is invalid.' => '',
-    'Name' => '',
-    'No file found!' => '',
-    'Open' => '',
-    'Open file folder' => '',
-    'Opening archive failed with error code %code%.' => '',
-    'Please select a valid destination folder for %title%.' => '',
-    'Revert to this version' => '',
-    'Root' => '',
-    'Select what file version you want to switch.' => '',
-    'Selected items...' => '',
-    'Show Post' => '',
-    'Show older versions' => '',
-    'Size' => '',
-    'Size: {size}' => '',
-    'Some files could not be imported: ' => '',
-    'Some files could not be moved: ' => '',
-    'The root folder is the entry point that contains all available files.' => '',
-    'This file is only visible for you and your friends.' => '',
-    'This file is private.' => '',
-    'This file is protected.' => '',
-    'This file is public.' => '',
-    'This folder is empty.' => '',
-    'This folder is only visible for you and your friends.' => '',
-    'This folder is private.' => '',
-    'This folder is protected.' => '',
-    'This folder is public.' => '',
-    'Time' => '',
-    'Unfortunately you have no permission to upload/edit files.' => '',
-    'Updated' => '',
-    'Upload files or create a subfolder with the buttons on the top.' => '',
-    'Upload files to the stream to fill this folder.' => '',
-    'Versions' => '',
-    'Wrong moved item!' => '',
-    'Wrong target folder!' => '',
-    'You can find all files that have been posted to this stream here.' => '',
-    'You cannot move the file "{name}"!' => '',
-    'You cannot move the folder "{name}"!' => '',
-    'ZIP selected' => '',
-    'ZIP support is not enabled.' => '',
-];
+return array (
+  '%filename% has invalid extension and was skipped.' => '',
+  '/ (root)' => '',
+  '<strong>Confirm</strong> delete file' => '',
+  '<strong>Create</strong> folder' => '',
+  '<strong>Edit</strong> file' => '',
+  '<strong>Edit</strong> folder' => '',
+  '<strong>File</strong> download url' => '',
+  '<strong>File</strong> url' => '',
+  '<strong>File</strong> versions' => '',
+  '<strong>Files</strong> module configuration' => '',
+  '<strong>Folder</strong> url' => '',
+  '<strong>Move</strong> files' => '',
+  'A file with that name already exists in this folder.' => '',
+  'Actions' => 'Akcie',
+  'Add directory' => '',
+  'Add file(s)' => '',
+  'Adds files module to this space.' => '',
+  'Adds files module to your profile.' => '',
+  'An error occurred while creating folder {folder}.' => '',
+  'An error occurred while unpacking {filename}.' => '',
+  'Archive %filename% could not be extracted.' => '',
+  'Author' => 'Autor',
+  'Cannot edit non existing file.' => '',
+  'Close' => '닫기',
+  'Could not find folder with id: %id%' => '',
+  'Could not move the item!' => '',
+  'Creator' => '',
+  'Delete' => 'Zmazať',
+  'Delete this version!' => '',
+  'Destination folder not found!' => '',
+  'Disable archive (ZIP) support' => '',
+  'Display Url' => '',
+  'Display a download count column' => '',
+  'Do you really want to delete this {number} item(s) with all subcontent?' => '',
+  'Download' => 'Stiahnuť',
+  'Download ZIP' => '',
+  'Downloads' => '',
+  'Edit' => 'Zmeniť',
+  'Edit directory' => '',
+  'File' => '',
+  'File "{movedItemName}" has been moved into the folder "{targetFolderName}".' => '',
+  'File {fileName} has been reverted to version from {fileDateTime}' => '',
+  'Files' => 'Súbory',
+  'Files from the stream' => '',
+  'Folder' => '',
+  'Folder "{movedItemName}" has been moved into the folder "{targetFolderName}".' => '',
+  'Folder should not start or end with blank space.' => '',
+  'Folder {name} can\'t be moved to itself!' => '',
+  'Folder {name} given folder is not editable!' => '',
+  'Import Zip' => '',
+  'Likes/Comments' => '',
+  'Make Private' => '',
+  'Make Public' => '',
+  'Move' => '',
+  'Move to another Space' => '',
+  'Moving to the same folder is not valid.' => '',
+  'Moving to this folder is invalid.' => '',
+  'Name' => 'Meno',
+  'No file found!' => '',
+  'Open' => 'Otvoriť',
+  'Open file folder' => '',
+  'Opening archive failed with error code %code%.' => '',
+  'Please select a valid destination folder for %title%.' => '',
+  'Revert to this version' => '',
+  'Root' => '',
+  'Select what file version you want to switch.' => '',
+  'Selected items...' => '',
+  'Show Post' => '',
+  'Show older versions' => '',
+  'Size' => '',
+  'Size: {size}' => '',
+  'Some files could not be imported: ' => '',
+  'Some files could not be moved: ' => '',
+  'The root folder is the entry point that contains all available files.' => '',
+  'This file is only visible for you and your friends.' => '',
+  'This file is private.' => '',
+  'This file is protected.' => '',
+  'This file is public.' => '',
+  'This folder is empty.' => '',
+  'This folder is only visible for you and your friends.' => '',
+  'This folder is private.' => '',
+  'This folder is protected.' => '',
+  'This folder is public.' => '',
+  'Time' => '',
+  'Unfortunately you have no permission to upload/edit files.' => '',
+  'Updated' => 'Aktualizované',
+  'Upload files or create a subfolder with the buttons on the top.' => '',
+  'Upload files to the stream to fill this folder.' => '',
+  'Versions' => '',
+  'Wrong moved item!' => '',
+  'Wrong target folder!' => '',
+  'You can find all files that have been posted to this stream here.' => '',
+  'You cannot move the file "{name}"!' => '',
+  'You cannot move the folder "{name}"!' => '',
+  'ZIP selected' => '',
+  'ZIP support is not enabled.' => '',
+);
diff --git a/messages/sr/base.php b/messages/sr/base.php
index 479cc95..fc64b5b 100644
--- a/messages/sr/base.php
+++ b/messages/sr/base.php
@@ -1,100 +1,99 @@
 <?php
-
-return [
-    'Actions' => 'Акције',
-    '%filename% has invalid extension and was skipped.' => '',
-    '/ (root)' => '',
-    '<strong>Confirm</strong> delete file' => '',
-    '<strong>Create</strong> folder' => '',
-    '<strong>Edit</strong> file' => '',
-    '<strong>Edit</strong> folder' => '',
-    '<strong>File</strong> download url' => '',
-    '<strong>File</strong> url' => '',
-    '<strong>File</strong> versions' => '',
-    '<strong>Files</strong> module configuration' => '',
-    '<strong>Folder</strong> url' => '',
-    '<strong>Move</strong> files' => '',
-    'A file with that name already exists in this folder.' => '',
-    'Add directory' => '',
-    'Add file(s)' => '',
-    'Adds files module to this space.' => '',
-    'Adds files module to your profile.' => '',
-    'An error occurred while creating folder {folder}.' => '',
-    'An error occurred while unpacking {filename}.' => '',
-    'Archive %filename% could not be extracted.' => '',
-    'Author' => '',
-    'Cannot edit non existing file.' => '',
-    'Close' => '',
-    'Could not find folder with id: %id%' => '',
-    'Could not move the item!' => '',
-    'Creator' => '',
-    'Delete' => '',
-    'Delete this version!' => '',
-    'Destination folder not found!' => '',
-    'Disable archive (ZIP) support' => '',
-    'Display Url' => '',
-    'Display a download count column' => '',
-    'Do you really want to delete this {number} item(s) with all subcontent?' => '',
-    'Download' => '',
-    'Download ZIP' => '',
-    'Downloads' => '',
-    'Edit' => '',
-    'Edit directory' => '',
-    'File' => '',
-    'File "{movedItemName}" has been moved into the folder "{targetFolderName}".' => '',
-    'File {fileName} has been reverted to version from {fileDateTime}' => '',
-    'Files' => '',
-    'Files from the stream' => '',
-    'Folder' => '',
-    'Folder "{movedItemName}" has been moved into the folder "{targetFolderName}".' => '',
-    'Folder should not start or end with blank space.' => '',
-    'Folder {name} can\'t be moved to itself!' => '',
-    'Folder {name} given folder is not editable!' => '',
-    'Import Zip' => '',
-    'Likes/Comments' => '',
-    'Make Private' => '',
-    'Make Public' => '',
-    'Move' => '',
-    'Move to another Space' => '',
-    'Moving to the same folder is not valid.' => '',
-    'Moving to this folder is invalid.' => '',
-    'Name' => '',
-    'No file found!' => '',
-    'Open' => '',
-    'Open file folder' => '',
-    'Opening archive failed with error code %code%.' => '',
-    'Please select a valid destination folder for %title%.' => '',
-    'Revert to this version' => '',
-    'Root' => '',
-    'Select what file version you want to switch.' => '',
-    'Selected items...' => '',
-    'Show Post' => '',
-    'Show older versions' => '',
-    'Size' => '',
-    'Size: {size}' => '',
-    'Some files could not be imported: ' => '',
-    'Some files could not be moved: ' => '',
-    'The root folder is the entry point that contains all available files.' => '',
-    'This file is only visible for you and your friends.' => '',
-    'This file is private.' => '',
-    'This file is protected.' => '',
-    'This file is public.' => '',
-    'This folder is empty.' => '',
-    'This folder is only visible for you and your friends.' => '',
-    'This folder is private.' => '',
-    'This folder is protected.' => '',
-    'This folder is public.' => '',
-    'Time' => '',
-    'Unfortunately you have no permission to upload/edit files.' => '',
-    'Updated' => '',
-    'Upload files or create a subfolder with the buttons on the top.' => '',
-    'Upload files to the stream to fill this folder.' => '',
-    'Versions' => '',
-    'Wrong moved item!' => '',
-    'Wrong target folder!' => '',
-    'You can find all files that have been posted to this stream here.' => '',
-    'You cannot move the file "{name}"!' => '',
-    'You cannot move the folder "{name}"!' => '',
-    'ZIP selected' => '',
-    'ZIP support is not enabled.' => '',
-];
+return array (
+  '%filename% has invalid extension and was skipped.' => '%filename% ima nevažeču ekstenziju i preskočen je..',
+  '/ (root)' => '/ (root)',
+  '<strong>Confirm</strong> delete file' => '<strong>Potvrdi</strong> brisanje fajla',
+  '<strong>Create</strong> folder' => '<strong>Kreiraj</strong> folder',
+  '<strong>Edit</strong> file' => '<strong>Uredi</strong> fajl',
+  '<strong>Edit</strong> folder' => '<strong>Uredi</strong> folder',
+  '<strong>File</strong> download url' => '<strong>Fajl</strong> url za preuzimanje',
+  '<strong>File</strong> url' => '<strong>Fajl</strong> url',
+  '<strong>File</strong> versions' => '',
+  '<strong>Files</strong> module configuration' => '<strong>Fajl</strong> konfiguracija modula',
+  '<strong>Folder</strong> url' => '<strong>Mapa</strong> url',
+  '<strong>Move</strong> files' => '<strong>Premesti</strong> fajlove',
+  'A file with that name already exists in this folder.' => 'Fajl s tim nazivom već postoji u ovom folderu.',
+  'Actions' => 'Акције',
+  'Add directory' => 'Dodaj direktorijum',
+  'Add file(s)' => 'Dodaj datoteku/e',
+  'Adds files module to this space.' => 'Dodaj Fajl modul ovom prostoru',
+  'Adds files module to your profile.' => 'Dodaj Fajl modul svom profilu',
+  'An error occurred while creating folder {folder}.' => 'Došlo je do greške prilikom izrade foldera {folder}.',
+  'An error occurred while unpacking {filename}.' => 'Došlo je do greške pri raspakivanju {filename}.',
+  'Archive %filename% could not be extracted.' => 'Arhiviranje %filename% nije moguće raspakovati.',
+  'Author' => 'Autor',
+  'Cannot edit non existing file.' => 'Nije moguce ureuređivati ne-postojeći fajl.',
+  'Close' => 'Zatvori',
+  'Could not find folder with id: %id%' => 'Nije moguće pronaći fasciklu s id: %id%',
+  'Could not move the item!' => '',
+  'Creator' => 'Kreator',
+  'Delete' => 'Obriši',
+  'Delete this version!' => '',
+  'Destination folder not found!' => 'Nije pronađena odredišna fascikla!',
+  'Disable archive (ZIP) support' => 'Onemogućite podršku za arhivu (ZIP)',
+  'Display Url' => 'URL za prikaz',
+  'Display a download count column' => 'Prikažite kolonu sa brojem preuzimanja',
+  'Do you really want to delete this {number} item(s) with all subcontent?' => 'Da li zaista želite da izbrišete ovaj broj {number}  stavki sa svim podsadržajem?',
+  'Download' => 'Preuzmi',
+  'Download ZIP' => 'Preuzmi ZIP',
+  'Downloads' => 'Preuzimanja',
+  'Edit' => 'Uredi',
+  'Edit directory' => 'Uredi direktorij',
+  'File' => 'Datoteka',
+  'File "{movedItemName}" has been moved into the folder "{targetFolderName}".' => '',
+  'File {fileName} has been reverted to version from {fileDateTime}' => '',
+  'Files' => 'Datoteke',
+  'Files from the stream' => 'Datoteke sa strima',
+  'Folder' => 'Mapa',
+  'Folder "{movedItemName}" has been moved into the folder "{targetFolderName}".' => '',
+  'Folder should not start or end with blank space.' => 'Ime fascikle ne sme da počinje ili se završava praznim prostorom.',
+  'Folder {name} can\'t be moved to itself!' => 'Fascikla {name} ne može se premestiti u sebe!',
+  'Folder {name} given folder is not editable!' => 'Fasciklu {name} dodanu mapu nije moguće uređivati!',
+  'Import Zip' => 'Uvezi zip',
+  'Likes/Comments' => 'Sviđa se/Komentari',
+  'Make Private' => 'Učini privatnim',
+  'Make Public' => 'Učini javnim',
+  'Move' => 'Premestiti',
+  'Move to another Space' => '',
+  'Moving to the same folder is not valid.' => 'Premeštanje u istu mapu nije valjano.',
+  'Moving to this folder is invalid.' => 'Premeštanje u ovu mapu nije važeće.',
+  'Name' => 'Ime',
+  'No file found!' => '',
+  'Open' => 'Otvori',
+  'Open file folder' => 'Otvorite fasciklu s fajlovima',
+  'Opening archive failed with error code %code%.' => 'Otvaranje arhive nije uspelo, kodo greške %code%.',
+  'Please select a valid destination folder for %title%.' => 'Odaberite validni odredišni folder za %title%.',
+  'Revert to this version' => '',
+  'Root' => 'Root',
+  'Select what file version you want to switch.' => '',
+  'Selected items...' => 'Odabrane stavke...',
+  'Show Post' => 'Prikaži objavu',
+  'Show older versions' => '',
+  'Size' => 'Veličina',
+  'Size: {size}' => 'Veličina: {size}',
+  'Some files could not be imported: ' => 'Neke fajlove nije moguće uvesti:',
+  'Some files could not be moved: ' => 'Neke fajlove nije moguće premestiti:',
+  'The root folder is the entry point that contains all available files.' => 'Root fascikla je ulazna tačka koja sadrži sve dostupne fajlove.',
+  'This file is only visible for you and your friends.' => 'Ovaj fajl je vidljiv samo vama i vašim prijateljima.',
+  'This file is private.' => 'Ovaj falj je privatan.',
+  'This file is protected.' => 'Ovaj fajl je zaštićen.',
+  'This file is public.' => 'Ovaj falj je javan.',
+  'This folder is empty.' => 'Ova fascikla je prazna.',
+  'This folder is only visible for you and your friends.' => 'Ova je fascikla vidljiva samo vama i vašim prijateljima.',
+  'This folder is private.' => 'Ova fascikla je privatna.',
+  'This folder is protected.' => 'Ova fascikla je zaštićena.',
+  'This folder is public.' => 'Ova fascikla je javna.',
+  'Time' => '',
+  'Unfortunately you have no permission to upload/edit files.' => 'Nažalost, nemate dopuštenje za prenos / uređivanje fajlova.',
+  'Updated' => 'Ažurirano',
+  'Upload files or create a subfolder with the buttons on the top.' => 'Prenos fajlova ili stvaranje podfascikle pomoću dugmeta na vrhu.',
+  'Upload files to the stream to fill this folder.' => 'Dodajte fajlove u stream da biste popunili ovu fasciklu.',
+  'Versions' => '',
+  'Wrong moved item!' => '',
+  'Wrong target folder!' => '',
+  'You can find all files that have been posted to this stream here.' => 'Ovde možete pronaći sve fajlove koje su objavljeni u ovom strim-u.',
+  'You cannot move the file "{name}"!' => '',
+  'You cannot move the folder "{name}"!' => '',
+  'ZIP selected' => 'ZIP odabrano',
+  'ZIP support is not enabled.' => 'ZIP podrška onemogućena',
+);
diff --git a/messages/sr/models_File.php b/messages/sr/models_File.php
index a90ca05..8b127e3 100644
--- a/messages/sr/models_File.php
+++ b/messages/sr/models_File.php
@@ -1,5 +1,4 @@
 <?php
-
-return [
-    'Folder ID' => '',
-];
+return array (
+  'Folder ID' => 'ID fascikle',
+);
diff --git a/messages/sr/models_FileSystemItem.php b/messages/sr/models_FileSystemItem.php
index 3fbb99e..aedb8ee 100644
--- a/messages/sr/models_FileSystemItem.php
+++ b/messages/sr/models_FileSystemItem.php
@@ -1,8 +1,7 @@
 <?php
-
-return [
-    'Downloads' => '',
-    'Hide in Stream' => '',
-    'Is Public' => '',
-    'Note: Changes of the folders visibility, will be inherited by all contained files and folders.' => '',
-];
+return array (
+  'Downloads' => 'Preuzimanja',
+  'Hide in Stream' => '',
+  'Is Public' => 'Javno',
+  'Note: Changes of the folders visibility, will be inherited by all contained files and folders.' => 'Napomena: Promene vidljivosti fascikala nasljeđuju sve sadržane datoteke i mape.',
+);
diff --git a/messages/sr/models_Folder.php b/messages/sr/models_Folder.php
index 89be952..50c0a49 100644
--- a/messages/sr/models_Folder.php
+++ b/messages/sr/models_Folder.php
@@ -1,7 +1,6 @@
 <?php
-
-return [
-    'Description' => '',
-    'Parent Folder ID' => '',
-    'Title' => '',
-];
+return array (
+  'Description' => 'Opis',
+  'Parent Folder ID' => 'ID roditeljske fascikle',
+  'Title' => 'Funkcija',
+);
diff --git a/messages/sr/permissions.php b/messages/sr/permissions.php
index b0e918d..82cf5c6 100644
--- a/messages/sr/permissions.php
+++ b/messages/sr/permissions.php
@@ -1,8 +1,7 @@
 <?php
-
-return [
-    'Add files' => '',
-    'Allows the user to modify or delete any files.' => '',
-    'Allows the user to upload new files and create folders' => '',
-    'Manage files' => '',
-];
+return array (
+  'Add files' => 'Dodaj fajlove',
+  'Allows the user to modify or delete any files.' => 'Korisniku omogućuje izmenu ili brisanje svih fajlova.',
+  'Allows the user to upload new files and create folders' => 'Korisniku omogućuje prenos novih fajlova i stvaranje foldera',
+  'Manage files' => 'Upravljaj fajlovima',
+);