diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 76fafc3265..1f69dca628 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -1,6 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "%s taşınamadı. Bu isimde dosya zaten var.",
+"Could not move %s - File with this name already exists" => "%s taşınamadı. Bu isimde dosya zaten mevcut",
 "Could not move %s" => "%s taşınamadı",
 "File name cannot be empty." => "Dosya adı boş olamaz.",
 "\"%s\" is an invalid file name." => "'%s' geçersiz bir dosya adı.",
diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php
index bb34494a5d..baab272d1d 100644
--- a/apps/files_external/l10n/sl.php
+++ b/apps/files_external/l10n/sl.php
@@ -6,6 +6,11 @@ $TRANSLATIONS = array(
 "Please provide a valid Dropbox app key and secret." => "Vpisati je treba veljaven ključ programa in kodo za Dropbox",
 "Error configuring Google Drive storage" => "Napaka nastavljanja shrambe Google Drive",
 "Saved" => "Shranjeno",
+"<b>Note:</b> " => "<b>Opomba:</b> ",
+" and " => "in",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Opomba:</b> Podpora za naslove cURL v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Opomba:</b> Podpora za protokol FTP v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Opomba:</b> Program \"%s\" ni nameščen. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
 "External Storage" => "Zunanja podatkovna shramba",
 "Folder name" => "Ime mape",
 "External storage" => "Zunanja shramba",
diff --git a/apps/user_ldap/l10n/ast.php b/apps/user_ldap/l10n/ast.php
index 2c02288001..032de8aedb 100644
--- a/apps/user_ldap/l10n/ast.php
+++ b/apps/user_ldap/l10n/ast.php
@@ -1,11 +1,41 @@
 <?php
 $TRANSLATIONS = array(
+"The configuration is invalid. Please have a look at the logs for further details." => "La configuración nun ye válida. Por favor, écha-y un güeyu a los rexistros pa más detalles.",
+"No action specified" => "Nun s'especificó l'aición",
+"No configuration specified" => "Nun s'especificó la configuración",
+"No data specified" => "Nun s'especificaron los datos",
+" Could not set configuration %s" => "Nun pudo afitase la configuración %s",
 "Deletion failed" => "Falló'l borráu",
+"Keep settings?" => "¿Caltener los axustes?",
+"Cannot add server configuration" => "Nun pue amestase la configuración del sirvidor",
+"Success" => "Con ésitu",
 "Error" => "Fallu",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
+"Configuration incorrect" => "Configuración incorreuta",
+"Configuration incomplete" => "Configuración incompleta",
+"Select groups" => "Esbillar grupos",
+"Select attributes" => "Esbillar atributos",
+"_%s group found_::_%s groups found_" => array("%s grupu alcontráu","%s grupos alcontraos"),
+"_%s user found_::_%s users found_" => array("%s usuariu alcontráu","%s usuarios alcontraos"),
+"Could not find the desired feature" => "Nun pudo alcontrase la carauterística deseyada",
 "Save" => "Guardar",
+"groups found" => "grupos alcontraos",
+"Users login with this attribute:" => "Aniciu de sesión d'usuarios con esti atributu:",
+"LDAP Username:" => "Nome d'usuariu LDAP",
+"Other Attributes:" => "Otros atributos:",
+"Add Server Configuration" => "Amestar configuración del sirvidor",
+"Host" => "Equipu",
+"Port" => "Puertu",
 "Password" => "Contraseña",
-"Continue" => "Continuar"
+"For anonymous access, leave DN and Password empty." => "Pa un accesu anónimu, dexar el DN y la contraseña baleros.",
+"users found" => "usuarios alcontraos",
+"Continue" => "Continuar",
+"Connection Settings" => "Axustes de conexón",
+"Configuration Active" => "Configuración activa",
+"When unchecked, this configuration will be skipped." => "Cuando nun tea conseñáu, saltaráse esta configuración.",
+"Disable Main Server" => "Deshabilitar sirvidor principal",
+"Turn off SSL certificate validation." => "Apagar la validación del certificáu SSL.",
+"Directory Settings" => "Axustes del direutoriu",
+"in bytes" => "en bytes",
+"Internal Username" => "Nome d'usuariu internu"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 7476d9f9c7..7da6a81086 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -51,6 +51,7 @@ $TRANSLATIONS = array(
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} spor datotek","{count} spora datotek","{count} spori datotek","{count} sporov datotek"),
 "One file conflict" => "En spor datotek",
 "New Files" => "Nove datoteke",
+"Already existing files" => "Obstoječe datoteke",
 "Which files do you want to keep?" => "Katare datoteke želite ohraniti?",
 "If you select both versions, the copied file will have a number added to its name." => "Če izberete obe različici, bo kopirani datoteki k imenu dodana številka.",
 "Cancel" => "Prekliči",
diff --git a/l10n/ast/user_ldap.po b/l10n/ast/user_ldap.po
index 3c4a00ce67..734b55e218 100644
--- a/l10n/ast/user_ldap.po
+++ b/l10n/ast/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-21 01:55-0400\n"
+"PO-Revision-Date: 2014-04-20 22:01+0000\n"
+"Last-Translator: Tornes Llume <l.lumex03.tornes@gmail.com>\n"
 "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,24 +40,24 @@ msgstr ""
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
-msgstr ""
+msgstr "La configuración nun ye válida. Por favor, écha-y un güeyu a los rexistros pa más detalles."
 
 #: ajax/wizard.php:32
 msgid "No action specified"
-msgstr ""
+msgstr "Nun s'especificó l'aición"
 
 #: ajax/wizard.php:38
 msgid "No configuration specified"
-msgstr ""
+msgstr "Nun s'especificó la configuración"
 
 #: ajax/wizard.php:81
 msgid "No data specified"
-msgstr ""
+msgstr "Nun s'especificaron los datos"
 
 #: ajax/wizard.php:89
 #, php-format
 msgid " Could not set configuration %s"
-msgstr ""
+msgstr "Nun pudo afitase la configuración %s"
 
 #: js/settings.js:67
 msgid "Deletion failed"
@@ -68,11 +69,11 @@ msgstr ""
 
 #: js/settings.js:84
 msgid "Keep settings?"
-msgstr ""
+msgstr "¿Caltener los axustes?"
 
 #: js/settings.js:99
 msgid "Cannot add server configuration"
-msgstr ""
+msgstr "Nun pue amestase la configuración del sirvidor"
 
 #: js/settings.js:127
 msgid "mappings cleared"
@@ -80,7 +81,7 @@ msgstr ""
 
 #: js/settings.js:128
 msgid "Success"
-msgstr ""
+msgstr "Con ésitu"
 
 #: js/settings.js:133
 msgid "Error"
@@ -92,15 +93,15 @@ msgstr ""
 
 #: js/settings.js:847
 msgid "Configuration incorrect"
-msgstr ""
+msgstr "Configuración incorreuta"
 
 #: js/settings.js:856
 msgid "Configuration incomplete"
-msgstr ""
+msgstr "Configuración incompleta"
 
 #: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
-msgstr ""
+msgstr "Esbillar grupos"
 
 #: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
@@ -108,7 +109,7 @@ msgstr ""
 
 #: js/settings.js:879
 msgid "Select attributes"
-msgstr ""
+msgstr "Esbillar atributos"
 
 #: js/settings.js:906
 msgid "Connection test succeeded"
@@ -130,15 +131,15 @@ msgstr ""
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s grupu alcontráu"
+msgstr[1] "%s grupos alcontraos"
 
 #: lib/wizard.php:122
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s usuariu alcontráu"
+msgstr[1] "%s usuarios alcontraos"
 
 #: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
@@ -146,7 +147,7 @@ msgstr ""
 
 #: lib/wizard.php:983
 msgid "Could not find the desired feature"
-msgstr ""
+msgstr "Nun pudo alcontrase la carauterística deseyada"
 
 #: templates/part.settingcontrols.php:2
 msgid "Save"
@@ -195,15 +196,15 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:38
 msgid "groups found"
-msgstr ""
+msgstr "grupos alcontraos"
 
 #: templates/part.wizard-loginfilter.php:4
 msgid "Users login with this attribute:"
-msgstr ""
+msgstr "Aniciu de sesión d'usuarios con esti atributu:"
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
-msgstr ""
+msgstr "Nome d'usuariu LDAP"
 
 #: templates/part.wizard-loginfilter.php:16
 msgid "LDAP Email Address:"
@@ -211,7 +212,7 @@ msgstr ""
 
 #: templates/part.wizard-loginfilter.php:24
 msgid "Other Attributes:"
-msgstr ""
+msgstr "Otros atributos:"
 
 #: templates/part.wizard-loginfilter.php:38
 #, php-format
@@ -222,11 +223,11 @@ msgstr ""
 
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Amestar configuración del sirvidor"
 
 #: templates/part.wizard-server.php:30
 msgid "Host"
-msgstr ""
+msgstr "Equipu"
 
 #: templates/part.wizard-server.php:31
 msgid ""
@@ -235,7 +236,7 @@ msgstr ""
 
 #: templates/part.wizard-server.php:36
 msgid "Port"
-msgstr ""
+msgstr "Puertu"
 
 #: templates/part.wizard-server.php:44
 msgid "User DN"
@@ -254,7 +255,7 @@ msgstr "Contraseña"
 
 #: templates/part.wizard-server.php:53
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Pa un accesu anónimu, dexar el DN y la contraseña baleros."
 
 #: templates/part.wizard-server.php:60
 msgid "One Base DN per line"
@@ -277,7 +278,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:38
 msgid "users found"
-msgstr ""
+msgstr "usuarios alcontraos"
 
 #: templates/part.wizardcontrols.php:5
 msgid "Back"
@@ -302,15 +303,15 @@ msgstr ""
 
 #: templates/settings.php:20
 msgid "Connection Settings"
-msgstr ""
+msgstr "Axustes de conexón"
 
 #: templates/settings.php:22
 msgid "Configuration Active"
-msgstr ""
+msgstr "Configuración activa"
 
 #: templates/settings.php:22
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "Cuando nun tea conseñáu, saltaráse esta configuración."
 
 #: templates/settings.php:23
 msgid "Backup (Replica) Host"
@@ -328,7 +329,7 @@ msgstr ""
 
 #: templates/settings.php:25
 msgid "Disable Main Server"
-msgstr ""
+msgstr "Deshabilitar sirvidor principal"
 
 #: templates/settings.php:25
 msgid "Only connect to the replica server."
@@ -340,7 +341,7 @@ msgstr ""
 
 #: templates/settings.php:27
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Apagar la validación del certificáu SSL."
 
 #: templates/settings.php:27
 #, php-format
@@ -359,7 +360,7 @@ msgstr ""
 
 #: templates/settings.php:30
 msgid "Directory Settings"
-msgstr ""
+msgstr "Axustes del direutoriu"
 
 #: templates/settings.php:32
 msgid "User Display Name Field"
@@ -444,7 +445,7 @@ msgstr ""
 
 #: templates/settings.php:45
 msgid "in bytes"
-msgstr ""
+msgstr "en bytes"
 
 #: templates/settings.php:46
 msgid "Email Field"
@@ -462,7 +463,7 @@ msgstr ""
 
 #: templates/settings.php:53
 msgid "Internal Username"
-msgstr ""
+msgstr "Nome d'usuariu internu"
 
 #: templates/settings.php:54
 msgid ""
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index f867acbd3d..9be90e0fbf 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-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:40+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-21 01:55-0400\n"
+"PO-Revision-Date: 2014-04-20 20:53+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"
@@ -246,7 +246,7 @@ msgstr "Nove datoteke"
 
 #: js/oc-dialogs.js:373
 msgid "Already existing files"
-msgstr ""
+msgstr "Obstoječe datoteke"
 
 #: js/oc-dialogs.js:375
 msgid "Which files do you want to keep?"
@@ -306,12 +306,12 @@ msgstr "V souporabi"
 msgid "Share"
 msgstr "Souporaba"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:731
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Napaka"
 
-#: js/share.js:160 js/share.js:787
+#: js/share.js:160 js/share.js:790
 msgid "Error while sharing"
 msgstr "Napaka med souporabo"
 
@@ -375,71 +375,71 @@ msgstr "Pošlji povezavo do dokumenta preko elektronske pošte:"
 msgid "No people found"
 msgstr "Ni najdenih uporabnikov"
 
-#: js/share.js:324 js/share.js:383
+#: js/share.js:324 js/share.js:385
 msgid "group"
 msgstr "skupina"
 
-#: js/share.js:355
+#: js/share.js:357
 msgid "Resharing is not allowed"
 msgstr "Nadaljnja souporaba ni dovoljena"
 
-#: js/share.js:399
+#: js/share.js:401
 msgid "Shared in {item} with {user}"
 msgstr "V souporabi v {item} z uporabnikom {user}"
 
-#: js/share.js:421
+#: js/share.js:423
 msgid "Unshare"
 msgstr "Prekliči souporabo"
 
-#: js/share.js:429
+#: js/share.js:431
 msgid "notify by email"
 msgstr "obvesti po elektronski pošti"
 
-#: js/share.js:432
+#: js/share.js:434
 msgid "can edit"
 msgstr "lahko ureja"
 
-#: js/share.js:434
+#: js/share.js:436
 msgid "access control"
 msgstr "nadzor dostopa"
 
-#: js/share.js:437
+#: js/share.js:439
 msgid "create"
 msgstr "ustvari"
 
-#: js/share.js:440
+#: js/share.js:442
 msgid "update"
 msgstr "posodobi"
 
-#: js/share.js:443
+#: js/share.js:445
 msgid "delete"
 msgstr "izbriše"
 
-#: js/share.js:446
+#: js/share.js:448
 msgid "share"
 msgstr "določi souporabo"
 
-#: js/share.js:718
+#: js/share.js:721
 msgid "Password protected"
 msgstr "Zaščiteno z geslom"
 
-#: js/share.js:731
+#: js/share.js:734
 msgid "Error unsetting expiration date"
 msgstr "Napaka brisanja datuma preteka"
 
-#: js/share.js:749
+#: js/share.js:752
 msgid "Error setting expiration date"
 msgstr "Napaka nastavljanja datuma preteka"
 
-#: js/share.js:774
+#: js/share.js:777
 msgid "Sending ..."
 msgstr "Pošiljanje ..."
 
-#: js/share.js:785
+#: js/share.js:788
 msgid "Email sent"
 msgstr "Elektronska pošta je poslana"
 
-#: js/share.js:809
+#: js/share.js:812
 msgid "Warning"
 msgstr "Opozorilo"
 
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index 46ee2ccbc1..e50f93e901 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-09 01:55-0400\n"
-"PO-Revision-Date: 2014-04-09 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-21 01:55-0400\n"
+"PO-Revision-Date: 2014-04-20 20:58+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"
@@ -42,34 +42,34 @@ msgstr "Napaka nastavljanja shrambe Google Drive"
 msgid "Saved"
 msgstr "Shranjeno"
 
-#: lib/config.php:592
+#: lib/config.php:598
 msgid "<b>Note:</b> "
-msgstr ""
+msgstr "<b>Opomba:</b> "
 
-#: lib/config.php:602
+#: lib/config.php:608
 msgid " and "
-msgstr ""
+msgstr "in"
 
-#: lib/config.php:624
+#: lib/config.php:630
 #, php-format
 msgid ""
 "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
 "of %s is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Opomba:</b> Podpora za naslove cURL v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika."
 
-#: lib/config.php:626
+#: lib/config.php:632
 #, php-format
 msgid ""
 "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
 " %s is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Opomba:</b> Podpora za protokol FTP v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika."
 
-#: lib/config.php:628
+#: lib/config.php:634
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
 " ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Opomba:</b> Program \"%s\" ni nameščen. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika."
 
 #: templates/settings.php:2
 msgid "External Storage"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index 6593ed803c..9693bf3642 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-10 01:54-0400\n"
-"PO-Revision-Date: 2014-04-09 06:10+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-21 01:55-0400\n"
+"PO-Revision-Date: 2014-04-20 20:59+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"
@@ -50,7 +50,7 @@ msgstr "Uporabniki"
 msgid "Admin"
 msgstr "Skrbništvo"
 
-#: private/app.php:875
+#: private/app.php:880
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Posodabljanje \"%s\" je spodletelo."
@@ -75,7 +75,7 @@ msgstr "Prejemanje datotek v paketu ZIP je onemogočeno."
 msgid "Files need to be downloaded one by one."
 msgstr "Datoteke je mogoče prejeti le posamično."
 
-#: private/files.php:234 private/files.php:262
+#: private/files.php:234 private/files.php:261
 msgid "Back to Files"
 msgstr "Nazaj na datoteke"
 
@@ -291,11 +291,11 @@ msgstr "%s je omogočil souporabo »%s«"
 msgid "Could not find category \"%s\""
 msgstr "Kategorije \"%s\" ni mogoče najti."
 
-#: private/template/functions.php:133
+#: private/template/functions.php:134
 msgid "seconds ago"
 msgstr "pred nekaj sekundami"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:135
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "pred %n minuto"
@@ -303,7 +303,7 @@ msgstr[1] "pred %n minutama"
 msgstr[2] "pred %n minutami"
 msgstr[3] "pred %n minutami"
 
-#: private/template/functions.php:135
+#: private/template/functions.php:136
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "pred %n uro"
@@ -311,15 +311,15 @@ msgstr[1] "pred %n urama"
 msgstr[2] "pred %n urami"
 msgstr[3] "pred %n urami"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:137
 msgid "today"
 msgstr "danes"
 
-#: private/template/functions.php:137
+#: private/template/functions.php:138
 msgid "yesterday"
 msgstr "včeraj"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:140
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "pred %n dnevom"
@@ -327,11 +327,11 @@ msgstr[1] "pred %n dnevoma"
 msgstr[2] "pred %n dnevi"
 msgstr[3] "pred %n dnevi"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:142
 msgid "last month"
 msgstr "zadnji mesec"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:143
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "pred %n mesecem"
@@ -339,28 +339,28 @@ msgstr[1] "pred %n mesecema"
 msgstr[2] "pred %n meseci"
 msgstr[3] "pred %n meseci"
 
-#: private/template/functions.php:144
+#: private/template/functions.php:145
 msgid "last year"
 msgstr "lansko leto"
 
-#: private/template/functions.php:145
+#: private/template/functions.php:146
 msgid "years ago"
 msgstr "let nazaj"
 
-#: private/user/manager.php:246
+#: private/user/manager.php:232
 msgid ""
 "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
 "\"0-9\", and \"_.@-\""
-msgstr ""
+msgstr "V uporabniškem imenu je dovoljeno uporabiti le znake: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\""
 
-#: private/user/manager.php:251
+#: private/user/manager.php:237
 msgid "A valid username must be provided"
 msgstr "Navedeno mora biti veljavno uporabniško ime"
 
-#: private/user/manager.php:255
+#: private/user/manager.php:241
 msgid "A valid password must be provided"
 msgstr "Navedeno mora biti veljavno geslo"
 
-#: private/user/manager.php:260
+#: private/user/manager.php:246
 msgid "The username is already being used"
-msgstr ""
+msgstr "Vpisano uporabniško ime je že v uporabi"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index cb3a6ecc8f..39ea1ec329 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-04-20 01:55-0400\n"
+"POT-Creation-Date: 2014-04-21 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 c6127a633f..27022f2c79 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-04-20 01:55-0400\n"
+"POT-Creation-Date: 2014-04-21 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 69b7c2f0b2..b4d444deba 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-04-20 01:55-0400\n"
+"POT-Creation-Date: 2014-04-21 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 f14f4084ca..6307ddbdad 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-04-20 01:55-0400\n"
+"POT-Creation-Date: 2014-04-21 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 8e0200f568..1bbd741991 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-04-20 01:55-0400\n"
+"POT-Creation-Date: 2014-04-21 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 13179f519c..1372eebdb1 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-04-20 01:55-0400\n"
+"POT-Creation-Date: 2014-04-21 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 135bf6b440..1306b57e85 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-04-20 01:55-0400\n"
+"POT-Creation-Date: 2014-04-21 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 9a3b40326a..865c7b594c 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-04-20 01:55-0400\n"
+"POT-Creation-Date: 2014-04-21 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"
@@ -74,7 +74,7 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:234 private/files.php:262
+#: private/files.php:234 private/files.php:261
 msgid "Back to Files"
 msgstr ""
 
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 9ec818085f..e180700c12 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-04-20 01:55-0400\n"
+"POT-Creation-Date: 2014-04-21 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"
@@ -74,7 +74,7 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:234 files.php:262
+#: files.php:234 files.php:261
 msgid "Back to Files"
 msgstr ""
 
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 7783a9e2e7..a9d7325486 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-04-20 01:55-0400\n"
+"POT-Creation-Date: 2014-04-21 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 082a3130b5..53f6270a73 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-04-20 01:55-0400\n"
+"POT-Creation-Date: 2014-04-21 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 330a208b0a..d7194035f6 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-04-20 01:55-0400\n"
+"POT-Creation-Date: 2014-04-21 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/tr/files.po b/l10n/tr/files.po
index b8465fffa9..ea746fec10 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-17 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 06:30+0000\n"
-"Last-Translator: Emre Saracoglu <emresaracoglu@live.com>\n"
+"POT-Creation-Date: 2014-04-21 01:55-0400\n"
+"PO-Revision-Date: 2014-04-20 13:10+0000\n"
+"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +25,7 @@ msgstr ""
 #: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr "%s taşınamadı. Bu isimde dosya zaten var."
+msgstr "%s taşınamadı. Bu isimde dosya zaten mevcut"
 
 #: ajax/move.php:25 ajax/move.php:28
 #, php-format
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index deb25c1af2..768e0b1b45 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:40+0000\n"
+"POT-Creation-Date: 2014-04-21 01:55-0400\n"
+"PO-Revision-Date: 2014-04-21 00:50+0000\n"
 "Last-Translator: volkangezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@ msgstr "Eğer bu e-postayı aldıysanız, ayarlar doğru gibi görünüyor."
 #: admin/controller.php:94
 msgid ""
 "A problem occurred while sending the e-mail. Please revisit your settings."
-msgstr "E-posta gönderilirken bir hata oluştu. Lütfen ayarlarınızı tekrar ziyaret edin."
+msgstr "E-posta gönderilirken bir hata oluştu. Lütfen ayarlarınıza tekrar bakın."
 
 #: admin/controller.php:99
 msgid "Email sent"
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index 6f9470401e..86172b5ab7 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -67,7 +67,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("pred %n mesecem","pred %n mesecema","pred %n meseci","pred %n meseci"),
 "last year" => "lansko leto",
 "years ago" => "let nazaj",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "V uporabniškem imenu je dovoljeno uporabiti le znake: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
 "A valid username must be provided" => "Navedeno mora biti veljavno uporabniško ime",
-"A valid password must be provided" => "Navedeno mora biti veljavno geslo"
+"A valid password must be provided" => "Navedeno mora biti veljavno geslo",
+"The username is already being used" => "Vpisano uporabniško ime je že v uporabi"
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index fa163ed137..4fdd08b2c4 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -4,7 +4,7 @@ $TRANSLATIONS = array(
 "Saved" => "Kaydedildi",
 "test email settings" => "e-posta ayarlarını sına",
 "If you received this email, the settings seem to be correct." => "Eğer bu e-postayı aldıysanız, ayarlar doğru gibi görünüyor.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "E-posta gönderilirken bir hata oluştu. Lütfen ayarlarınızı tekrar ziyaret edin.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "E-posta gönderilirken bir hata oluştu. Lütfen ayarlarınıza tekrar bakın.",
 "Email sent" => "E-posta gönderildi",
 "You need to set your user email before being able to send test emails." => "Sınama e-postaları göndermeden önce kullanıcı e-postasını ayarlamanız gerekiyor.",
 "Send mode" => "Gönderme kipi",