diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index b2a21b6e0296ee9901a4c8517001db62b5e6ad4e..b6df62ffb79f3eb0cba0964e33d7dd37c8657532 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -85,6 +85,7 @@ $TRANSLATIONS = array(
 "One Group Base DN per line" => "Eno osnovno ime skupine na vrstico",
 "Group Search Attributes" => "Skupinski atributi iskanja",
 "Group-Member association" => "Povezava Älan-skupina",
+"Nested Groups" => "Gnezdene skupine",
 "Special Attributes" => "Posebni atributi",
 "Quota Field" => "Polje koliÄinske omejitve",
 "Quota Default" => "Privzeta koliÄinska omejitev",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 2cfdfd11899c88d5096b448a82f93f2a4bba7490..49eb4f9aa6976b83f98880855bee642d87ed8534 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -122,6 +122,8 @@ $TRANSLATIONS = array(
 "To login page" => "Na prijavno stran",
 "New password" => "Novo geslo",
 "Reset password" => "Ponastavi geslo",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Sistem Mac OS X ni podprt, zato %s ne bo deloval zanesljivo v tem okolju. Program uporabljate na lastno odgovornost! ",
+"For the best results, please consider using a GNU/Linux server instead." => "Za najbolj Å¡e rezultate je priporoÄljivo uporabljati streÅ¾nik GNU/Linux.",
 "Personal" => "Osebno",
 "Users" => "Uporabniki",
 "Apps" => "Programi",
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index ddd78cae32fcc6b679698125f4ca41bd8b3c9bd4..e3285d025c880bb5f58d61f720f244c9ff5d9b05 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-30 01:55-0400\n"
+"PO-Revision-Date: 2014-03-29 20:30+0000\n"
+"Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,24 +19,24 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: ajax/share.php:88
+#: ajax/share.php:87
 msgid "Expiration date is in the past."
 msgstr "Datum preteka je v preteklosti."
 
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Ni mogoÄe poslati sporoÄila za: %s"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "VzdrÅ¾evalni naÄin je omogoÄen"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "VzdrÅ¾evalni naÄin je onemogoÄen"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 msgid "Updated database"
 msgstr "Posodobljena podatkovna zbirka"
 
@@ -140,15 +140,15 @@ msgstr "december"
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: js/js.js:496
+#: js/js.js:543
 msgid "Saving..."
 msgstr "Poteka shranjevanje ..."
 
-#: js/js.js:995
+#: js/js.js:1103
 msgid "seconds ago"
 msgstr "pred nekaj sekundami"
 
-#: js/js.js:996
+#: js/js.js:1104
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "pred %n minuto"
@@ -156,7 +156,7 @@ msgstr[1] "pred %n minutama"
 msgstr[2] "pred %n minutami"
 msgstr[3] "pred %n minutami"
 
-#: js/js.js:997
+#: js/js.js:1105
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "pred %n uro"
@@ -164,15 +164,15 @@ msgstr[1] "pred %n urama"
 msgstr[2] "pred %n urami"
 msgstr[3] "pred %n urami"
 
-#: js/js.js:998
+#: js/js.js:1106
 msgid "today"
 msgstr "danes"
 
-#: js/js.js:999
+#: js/js.js:1107
 msgid "yesterday"
 msgstr "vÄeraj"
 
-#: js/js.js:1000
+#: js/js.js:1108
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "pred %n dnevom"
@@ -180,11 +180,11 @@ msgstr[1] "pred %n dnevoma"
 msgstr[2] "pred %n dnevi"
 msgstr[3] "pred %n dnevi"
 
-#: js/js.js:1001
+#: js/js.js:1109
 msgid "last month"
 msgstr "zadnji mesec"
 
-#: js/js.js:1002
+#: js/js.js:1110
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "pred %n mesecem"
@@ -192,15 +192,15 @@ msgstr[1] "pred %n mesecema"
 msgstr[2] "pred %n meseci"
 msgstr[3] "pred %n meseci"
 
-#: js/js.js:1003
+#: js/js.js:1111
 msgid "months ago"
 msgstr "mesecev nazaj"
 
-#: js/js.js:1004
+#: js/js.js:1112
 msgid "last year"
 msgstr "lansko leto"
 
-#: js/js.js:1005
+#: js/js.js:1113
 msgid "years ago"
 msgstr "let nazaj"
 
@@ -545,17 +545,17 @@ msgstr "Novo geslo"
 msgid "Reset password"
 msgstr "Ponastavi geslo"
 
-#: setup/controller.php:138
+#: setup/controller.php:140
 #, php-format
 msgid ""
 "Mac OS X is not supported and %s will not work properly on this platform. "
 "Use it at your own risk! "
-msgstr ""
+msgstr "Sistem Mac OS X ni podprt, zato %s ne bo deloval zanesljivo v tem okolju. Program uporabljate na lastno odgovornost! "
 
-#: setup/controller.php:142
+#: setup/controller.php:144
 msgid ""
 "For the best results, please consider using a GNU/Linux server instead."
-msgstr ""
+msgstr "Za najbolj Å¡e rezultate je priporoÄljivo uporabljati streÅ¾nik GNU/Linux."
 
 #: strings.php:5
 msgid "Personal"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 91e310d8f24f9abcfd65623cb7b9fd8933d0cdaf..dbde28d85dd9c000f420371f76cdaf8a5991ae3f 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-26 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-30 01:55-0400\n"
+"PO-Revision-Date: 2014-03-29 20:50+0000\n"
+"Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@ msgstr ""
 #: admin/controller.php:66
 #, php-format
 msgid "Invalid value supplied for %s"
-msgstr ""
+msgstr "Navedena je napaÄna vrednost za %s"
 
 #: admin/controller.php:73
 msgid "Saved"
@@ -66,7 +66,7 @@ msgid "Unable to load list from App Store"
 msgstr "Ni mogoÄe naloÅ¾iti seznama iz programskega srediÅ¡Äa"
 
 #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20 changepassword/controller.php:55
+#: ajax/togglegroups.php:20 changepassword/controller.php:49
 msgid "Authentication error"
 msgstr "Napaka med overjanjem"
 
@@ -128,32 +128,32 @@ msgstr "Uporabnika ni mogoÄe odstraniti iz skupine %s"
 msgid "Couldn't update app."
 msgstr "Programa ni mogoÄe posodobiti."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "NapaÄno geslo"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Ni navedenega uporabnika"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Podati je treba skrbniÅ¡ko obnovitveno geslo, sicer bodo vsi uporabniÅ¡ki podatki izgubljeni."
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "NapaÄno navedeno skrbniÅ¡ko obnovitveno geslo. Preverite geslo in poskusite znova."
 
-#: changepassword/controller.php:87
+#: changepassword/controller.php:81
 msgid ""
 "Back-end doesn't support password change, but the users encryption key was "
 "successfully updated."
 msgstr "HrbtiÅ¡Äe programa ne podpira spreminjanja gesla, je pa uspeÅ¡no posodobljeno uporabniÅ¡ko Å¡ifriranje."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Ni mogoÄe spremeniti gesla"
 
@@ -286,7 +286,7 @@ msgstr "Navedeno mora biti veljavno geslo"
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Opozorilo: osebna mapa uporabnika \"{user}\" Å¾e obstaja"
 
-#: personal.php:49 personal.php:50
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "SlovenÅ¡Äina"
 
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index 5a24ba9ffa7072d057e8ea5a4f71eba845c92cfb..222415e4d01680a720b6e65ca4ed6c98512a1f21 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # barbarak <barbarak@arnes.si>, 2013
-# mateju <>, 2013
+# mateju <>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-30 01:55-0400\n"
+"PO-Revision-Date: 2014-03-29 20:50+0000\n"
+"Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -417,7 +417,7 @@ msgstr "Povezava Älan-skupina"
 
 #: templates/settings.php:39
 msgid "Nested Groups"
-msgstr ""
+msgstr "Gnezdene skupine"
 
 #: templates/settings.php:39
 msgid ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index e53a6e7be1134a7694d735275a0e1df8f341fc44..e121b6d17a4b85ecbc5d2de8a80f6ba17fc86de5 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-29 01:55-0400\n"
+"POT-Creation-Date: 2014-03-30 01:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index ab798413e16f0227df5802d005d7b1a5a6b340e7..55217cf4e9b865508ff2d31c959a46f379b64eba 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-29 01:55-0400\n"
+"POT-Creation-Date: 2014-03-30 01:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index a02470e332f2454ced9e9fa0ac9736a1014c0194..dbae6761cb32a4d1a6b1b611fd159063227826d4 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-29 01:55-0400\n"
+"POT-Creation-Date: 2014-03-30 01:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 4fa49bd9280adf4f4d11562adf3d02076395c93c..25d27460e975b5a5eab61c809db0ddc2a48f7103 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-29 01:55-0400\n"
+"POT-Creation-Date: 2014-03-30 01:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 1cf0e96e29839a89cc4aa0ea141049b63cbca5d4..80bb68a9c3c5101a0d37d1ffbdb7e9a514aeb147 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-29 01:55-0400\n"
+"POT-Creation-Date: 2014-03-30 01:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 6259fe5f8e88f151f6a9ba430e8de5de60fc4d73..c59d59cc9313dedfa3830f1bdb4974a18d6674ea 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-29 01:55-0400\n"
+"POT-Creation-Date: 2014-03-30 01:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 270f007084bc3dc5d3a3a468856d2445e874cc1b..0607bbcedb1d5358f71e46da23b3f03708dcb322 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-29 01:55-0400\n"
+"POT-Creation-Date: 2014-03-30 01:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 3320212771cd1407c7f0dfdb0b05335746db5a06..3638bd22efd13b938560ace5c1501401a9db9143 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-29 01:55-0400\n"
+"POT-Creation-Date: 2014-03-30 01:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 4f0be4197155c46c3800592057788c5480ce828f..38923e73dd091f8690a71db0e2a01d7ad6c8e86a 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-29 01:55-0400\n"
+"POT-Creation-Date: 2014-03-30 01:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 0223d8e2cf303c5fb4b0df1af8405f4512942514..0c628b82bf330cf59c2e23e0f8eed438c7738edd 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-29 01:55-0400\n"
+"POT-Creation-Date: 2014-03-30 01:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index b0c1b1ce4b8702325c91560504cc771ea301ddcb..e9e4f6b3235b6850c9c904d40e24237a3c0e662f 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-29 01:55-0400\n"
+"POT-Creation-Date: 2014-03-30 01:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 5acbae2836d5ae142c76c7513e58b74289332963..224a8368cd91b3f0f92cf348bedc2df7a4fc8dd2 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-29 01:55-0400\n"
+"POT-Creation-Date: 2014-03-30 01:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index fea2d4cc3ad3e40e0f2a6c239997a92191d706cb..414f46712e388ec44d4b94cc89f51cf60be4da37 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Navedena je napaÄna vrednost za %s",
 "Saved" => "Shranjeno",
 "Email sent" => "Elektronska poÅ¡ta je poslana",
 "Send mode" => "NaÄin poÅ¡iljanja",