diff --git a/lang/pl.ini b/lang/pl.ini
index 40efc48..9fb7c41 100644
--- a/lang/pl.ini
+++ b/lang/pl.ini
@@ -1,71 +1,72 @@
 About = "Informacje"
 Add_category = "Dodaj kategorię"
-Add_content = "Dodaj kontent"
+Add_content = "Dodaj zawartość"
 Add_sub = "Dodaj podstronę"
 Admin = "Admin"
 All_blog_posts = "Wszystkie posty"
 Archives = "Archiwa"
 Are_you_sure_you_want_to_delete_ = "Czy chcesz usunąć <strong>%s</strong>?"
-Audio_post = "Audio post"
+Audio_post = "Post audio"
 Audio_post_comment = "Utwórz dźwiękowy post na blogu"
 Author = "Autor"
 Backup = "Kopia zapasowa"
 Cancel = "Anuluj"
 Categories = "Kategorie"
 Category = "Kategoria"
-Clear_cache = "Wyczyść cache"
+Clear_cache = "Wyczyść pamięć podręczną"
 Config = "Konfigóracja"
 Contents = "Zawartość"
 Created = "Utworzono"
 Delete = "Usuń"
-Description = "Description"
-Draft = "Draft"
-Edit = "Edit"
-Edit_profile = "Edit profile"
-Filename = "Filename"
+Description = "Opis"
+Draft = "Wersja robocza"
+Edit = "Edytuj"
+Edit_profile = "Edytuj profil"
+Filename = "Nazwa pliku"
 Follow = "Follow"
-Image_post = "Image post"
-Image_post_comment = "Creating blog post with featured image"
+Image_post = "Post obrazkowy"
+Image_post_comment = "Tworzy post z wyróżnionym zdjęciem"
 Import = "Import"
-Link_post = "Link post"
-Link_post_comment = "Creating blog post with featured link"
+Link_post = "Odnośnik"
+Link_post_comment = "Tworzy post z wyróżnionym linkiem"
 Login = "Login"
-Login_page = "Login page"
-Logout = "Logout"
+Login_page = "Strona logowania"
+Logout = "Wyloguj się"
 Meta_description = "Meta description"
-Mine = "Mine"
-More = "More"
-My_draft = "My draft"
-My_posts = "My posts"
-Newer = "Newer"
-Next = "Next"
-Next_post = "Next post"
-No_draft_found = "No draft found"
-No_posts_found = "No posts found"
-No_related_post_found = "No related post found"
-Older = "Older"
-Operations = "Operations"
-Popular_posts = "Popular posts"
-Popular_tags = "Popular tags"
-Posted_in = "Posted in"
-Posted_on = "Posted on"
-Posts = "Posts"
-Prev = "Old"
-Prev_post = "Previous Post"
+Mine = "Moje"
+More = "Więcej"
+My_draft = "Mój szkic"
+My_posts = "Moje posty"
+Newer = "Nigdy"
+Next = "Dalej"
+Next_post = "Następny post"
+No_draft_found = "Nie znaleziono szkicu"
+No_posts_found = "Nie znaleziono postów"
+No_related_post_found = "Nie znaleziono powiązanych postów."
+No_newer_posts = "Nie znaleziono najnowszych postów"
+Older = "Starsze"
+Operations = "Operacje"
+Popular_posts = "Popularne posty"
+Popular_tags = "Popularne tagi"
+Posted_in = "Napisano w"
+Posted_on = "Opublikowano "
+Posts = "Posty"
+Prev = "Starszy"
+Prev_post = "Poprzedni post"
 Publish = "Opublikuj"
 Publish_draft = "Opublikuj wersję roboczą"
 Published = "Opublikowano"
 Quote_post = "Cytuj post"
 Quote_post_comment = "Tworzenie postu z cytatem"
-Recent_posts = "Ostatnie"
+Recent_posts = "Ostatnie posty"
 Regular_post = "Standardowy post"
 Regular_post_comment = "Tworzenie zwykłego postu"
-Related_posts = "Powiazane posty"
-Revert_to_draft = "Revert to draft"
+Related_posts = "Powiązane posty"
+Revert_to_draft = "Cofnij do wersji roboczej"
 Save = "Zapisz"
-Save_as_draft = "Zapisz jako wersja robocza"
+Save_as_draft = "Zapisz jako szkic"
 Search = "Szukaj"
-Search_for = "Search for"
+Search_for = "Szukaj"
 Static_page = "Statyczna strona"
 Static_page_comment = "Tworzy statyczną stronę"
 Static_pages = "Strony statyczne"
@@ -73,15 +74,14 @@ Tag = "Tag"
 Tags = "Tagi"
 Title = "Tytuł"
 Uncategorized = "Bez kategorii"
-Uncategorized_comment = "Topics that don't need a category, or don't fit into any other existing category"
+Uncategorized_comment = "Wpisy, któe nie potrzebują kategorii, lub niepasujące do żadnej kategorii."
 Update = "Aktualizacja"
-Update_draft = "Aktualizuj wersję roboczą"
+Update_draft = "Aktualizuj szkic"
 Update_post = "Aktualizuj post"
-Video_post = "Video post"
-Video_post_comment = "Creating blog post with featured video"
+Video_post = "Film"
+Video_post_comment = "Tworzy post z wyróżnionym filmem."
 View = "Zobacz"
 Views = "Wyświetleń"
 Your_recent_posts = "Twoje ostatnie posty"
 by = "przez"
 read_more = "Czytaj więcej"
-  
diff --git a/system/includes/functions.php b/system/includes/functions.php
index 45f2e0f..9e8cfd6 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -3207,22 +3207,26 @@ function get_language()
 	
     $langID = config('language');
     $langFile = 'lang/'. $langID . '.ini';
-    $local = $langID;
 
     // Settings for the language
-    if (!isset($langID) || config('language') === 'en') {
+    if (!isset($langID) || config('language') === 'en' || !file_exists($langFile)) {
         i18n('source', 'lang/en.ini'); // Load the English language file
-        setlocale(LC_ALL, 'en_US'); // Change time format to English
+        setlocale(LC_ALL, 'en_US', 'en_US.utf8', 'English'); // Change locale to English
     } else {	
-        if (file_exists($langFile)) {
-            i18n('source', $langFile);
-            setlocale(LC_ALL, $local);
-        } else {
-            i18n('source', 'lang/en.ini'); // Load the English language file
-            setlocale(LC_ALL, 'en_US'); // Change time format to English
+        i18n('source', $langFile);
+
+        // Locales are known under different names on different systems; I don't know any other way
+        // to handle this than to add a list of locale names for each language.
+        if ($langID === 'de') {
+            setlocale(LC_ALL, 'de_DE', 'de_DE.utf8', 'German');
+        }
+        elseif ($langID === 'sv') {
+            setlocale(LC_ALL,  'sv_SE', 'sv_SE.utf8', 'Swedish');
+        }
+        elseif ($langID === 'pl') {
+            setlocale(LC_ALL,  'pl_PL', 'pl_PL.utf8', 'Polish');   
         }
     }
-
 }
 
 function format_date($date)
@@ -3231,9 +3235,9 @@ function format_date($date)
     $date_format = config('date.format');
     
     if (!isset($date_format) || empty($date_format)) {
-        return date('d F Y', $date);
+        return strftime('%e %B %Y', $date);
     } else {
-        return date($date_format, $date);	
+        return strftime($date_format, $date);	
     }
 
 }