[tx-robot] updated from transifex

5 files changed, 422 insertions, 264 deletions

diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 20c259a7cef..6e1ba3b9497 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 00:41+0000\n"
+"POT-Creation-Date: 2013-10-27 02:28-0400\n"
+"PO-Revision-Date: 2013-10-27 06:28+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
 
-#: ajax/share.php:327
-msgid "group"
-msgstr "група"
-
 #: ajax/update.php:11
 msgid "Turned on maintenance mode"
 msgstr ""
@@ -277,144 +273,148 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
-#: js/share.js:30 js/share.js:45 js/share.js:87
+#: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:90
+#: js/share.js:109
 msgid "Share"
 msgstr "Дели"
 
-#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
-#: js/share.js:679
+#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
+#: js/share.js:688
 msgid "Error"
 msgstr "Грешка"
 
-#: js/share.js:132 js/share.js:707
+#: js/share.js:151 js/share.js:716
 msgid "Error while sharing"
 msgstr "Грешка у дељењу"
 
-#: js/share.js:143
+#: js/share.js:162
 msgid "Error while unsharing"
 msgstr "Грешка код искључења дељења"
 
-#: js/share.js:150
+#: js/share.js:169
 msgid "Error while changing permissions"
 msgstr "Грешка код промене дозвола"
 
-#: js/share.js:159
+#: js/share.js:178
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Дељено са вама и са групом {group}. Поделио {owner}."
 
-#: js/share.js:161
+#: js/share.js:180
 msgid "Shared with you by {owner}"
 msgstr "Поделио са вама {owner}"
 
-#: js/share.js:184
-msgid "Share with"
-msgstr "Подели са"
+#: js/share.js:203
+msgid "Share with user or group …"
+msgstr ""
 
-#: js/share.js:189
-msgid "Share with link"
-msgstr "Подели линк"
+#: js/share.js:209
+msgid "Share link"
+msgstr ""
 
-#: js/share.js:192
+#: js/share.js:212
 msgid "Password protect"
 msgstr "Заштићено лозинком"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:32
+#: js/share.js:214 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "Лозинка"
 
-#: js/share.js:199
+#: js/share.js:219
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:203
+#: js/share.js:223
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:204
+#: js/share.js:224
 msgid "Send"
 msgstr "Пошаљи"
 
-#: js/share.js:209
+#: js/share.js:229
 msgid "Set expiration date"
 msgstr "Постави датум истека"
 
-#: js/share.js:210
+#: js/share.js:230
 msgid "Expiration date"
 msgstr "Датум истека"
 
-#: js/share.js:243
+#: js/share.js:263
 msgid "Share via email:"
 msgstr "Подели поштом:"
 
-#: js/share.js:246
+#: js/share.js:266
 msgid "No people found"
 msgstr "Особе нису пронађене."
 
-#: js/share.js:284
+#: js/share.js:295 js/share.js:332
+msgid "group"
+msgstr "група"
+
+#: js/share.js:306
 msgid "Resharing is not allowed"
 msgstr "Поновно дељење није дозвољено"
 
-#: js/share.js:320
+#: js/share.js:348
 msgid "Shared in {item} with {user}"
 msgstr "Подељено унутар {item} са {user}"
 
-#: js/share.js:341
+#: js/share.js:370
 msgid "Unshare"
 msgstr "Укини дељење"
 
-#: js/share.js:353
-msgid "notify user by email"
+#: js/share.js:378
+msgid "notify by email"
 msgstr ""
 
-#: js/share.js:361
+#: js/share.js:381
 msgid "can edit"
 msgstr "може да мења"
 
-#: js/share.js:363
+#: js/share.js:383
 msgid "access control"
 msgstr "права приступа"
 
-#: js/share.js:366
+#: js/share.js:386
 msgid "create"
 msgstr "направи"
 
-#: js/share.js:369
+#: js/share.js:389
 msgid "update"
 msgstr "ажурирај"
 
-#: js/share.js:372
+#: js/share.js:392
 msgid "delete"
 msgstr "обриши"
 
-#: js/share.js:375
+#: js/share.js:395
 msgid "share"
 msgstr "подели"
 
-#: js/share.js:409 js/share.js:654
+#: js/share.js:437 js/share.js:663
 msgid "Password protected"
 msgstr "Заштићено лозинком"
 
-#: js/share.js:667
+#: js/share.js:676
 msgid "Error unsetting expiration date"
 msgstr "Грешка код поништавања датума истека"
 
-#: js/share.js:679
+#: js/share.js:688
 msgid "Error setting expiration date"
 msgstr "Грешка код постављања датума истека"
 
-#: js/share.js:694
+#: js/share.js:703
 msgid "Sending ..."
 msgstr "Шаљем..."
 
-#: js/share.js:705
+#: js/share.js:714
 msgid "Email sent"
 msgstr "Порука је послата"
 
-#: js/share.js:729
+#: js/share.js:738
 msgid "Warning"
 msgstr "Упозорење"
 
@@ -526,7 +526,7 @@ msgstr "Лично"
 msgid "Users"
 msgstr "Корисници"
 
-#: strings.php:7 templates/layout.user.php:109
+#: strings.php:7 templates/layout.user.php:110
 msgid "Apps"
 msgstr "Апликације"
 
@@ -684,12 +684,12 @@ msgstr "Заврши подешавање"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:42
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:70
+#: templates/layout.user.php:71
 msgid "Log out"
 msgstr "Одјава"
 
@@ -743,7 +743,26 @@ msgstr ""
 msgid "The share will expire on %s.<br><br>"
 msgstr ""
 
-#: templates/update.php:3
+#: templates/update.admin.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "Надоградња ownCloud-а на верзију %s, сачекајте тренутак."
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
+msgstr ""
+
+#: templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 10d614b377c..0da994eccd3 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 00:41+0000\n"
+"POT-Creation-Date: 2013-10-27 02:28-0400\n"
+"PO-Revision-Date: 2013-10-27 06:28+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -27,62 +27,102 @@ msgstr "Не могу да преместим %s – датотека с ови�
 msgid "Could not move %s"
 msgstr "Не могу да преместим %s"
 
-#: ajax/upload.php:16 ajax/upload.php:45
+#: ajax/newfile.php:56
+msgid "File name cannot not be empty."
+msgstr ""
+
+#: ajax/newfile.php:62
+msgid "File name must not contain \"/\". Please choose a different name."
+msgstr ""
+
+#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:81
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:94
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:127
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:21
+msgid "Folder name cannot not be empty."
+msgstr ""
+
+#: ajax/newfolder.php:27
+msgid "Folder name must not contain \"/\". Please choose a different name."
+msgstr ""
+
+#: ajax/newfolder.php:56
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:18 ajax/upload.php:50
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:22
+#: ajax/upload.php:27
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:59
+#: ajax/upload.php:64
 msgid "No file was uploaded. Unknown error"
 msgstr "Ниједна датотека није отпремљена услед непознате грешке"
 
-#: ajax/upload.php:66
+#: ajax/upload.php:71
 msgid "There is no error, the file uploaded with success"
 msgstr "Није дошло до грешке. Датотека је успешно отпремљена."
 
-#: ajax/upload.php:67
+#: ajax/upload.php:72
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Отпремљена датотека прелази смерницу upload_max_filesize у датотеци php.ini:"
 
-#: ajax/upload.php:69
+#: ajax/upload.php:74
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Отпремљена датотека прелази смерницу MAX_FILE_SIZE која је наведена у HTML обрасцу"
 
-#: ajax/upload.php:70
+#: ajax/upload.php:75
 msgid "The uploaded file was only partially uploaded"
 msgstr "Датотека је делимично отпремљена"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:76
 msgid "No file was uploaded"
 msgstr "Датотека није отпремљена"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:77
 msgid "Missing a temporary folder"
 msgstr "Недостаје привремена фасцикла"
 
-#: ajax/upload.php:73
+#: ajax/upload.php:78
 msgid "Failed to write to disk"
 msgstr "Не могу да пишем на диск"
 
-#: ajax/upload.php:91
+#: ajax/upload.php:96
 msgid "Not enough storage available"
 msgstr "Нема довољно простора"
 
-#: ajax/upload.php:122 ajax/upload.php:148
+#: ajax/upload.php:127 ajax/upload.php:153
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:138
+#: ajax/upload.php:143
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:165
+#: ajax/upload.php:170
 msgid "Invalid directory."
 msgstr "неисправна фасцикла."
 
@@ -90,98 +130,94 @@ msgstr "неисправна фасцикла."
 msgid "Files"
 msgstr "Датотеке"
 
-#: js/file-upload.js:224
+#: js/file-upload.js:228
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:235
+#: js/file-upload.js:239
 msgid "Not enough space available"
 msgstr "Нема довољно простора"
 
-#: js/file-upload.js:302
+#: js/file-upload.js:306
 msgid "Upload cancelled."
 msgstr "Отпремање је прекинуто."
 
-#: js/file-upload.js:336
+#: js/file-upload.js:340
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:426
+#: js/file-upload.js:432
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање."
 
-#: js/file-upload.js:500
-msgid "URL cannot be empty."
-msgstr "Адреса не може бити празна."
+#: js/file-upload.js:511
+msgid "URL cannot be empty"
+msgstr ""
 
-#: js/file-upload.js:505 lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+#: js/file-upload.js:515 js/filelist.js:361
+msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
-msgid "Error"
-msgstr "Грешка"
+#: js/file-upload.js:517 js/filelist.js:363
+msgid "{new_name} already exists"
+msgstr "{new_name} већ постоји"
+
+#: js/file-upload.js:576
+msgid "Could not create file"
+msgstr ""
 
-#: js/fileactions.js:119
+#: js/file-upload.js:592
+msgid "Could not create folder"
+msgstr ""
+
+#: js/fileactions.js:125
 msgid "Share"
 msgstr "Дели"
 
-#: js/fileactions.js:131
+#: js/fileactions.js:137
 msgid "Delete permanently"
 msgstr "Обриши за стално"
 
-#: js/fileactions.js:184
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Преименуј"
 
-#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:789
+#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:850
 msgid "Pending"
 msgstr "На чекању"
 
-#: js/filelist.js:416 js/filelist.js:418
-msgid "{new_name} already exists"
-msgstr "{new_name} већ постоји"
-
-#: js/filelist.js:416 js/filelist.js:418
-msgid "replace"
-msgstr "замени"
-
-#: js/filelist.js:416
-msgid "suggest name"
-msgstr "предложи назив"
-
-#: js/filelist.js:416 js/filelist.js:418
-msgid "cancel"
-msgstr "откажи"
+#: js/filelist.js:389
+msgid "Could not rename file"
+msgstr ""
 
-#: js/filelist.js:463
+#: js/filelist.js:508
 msgid "replaced {new_name} with {old_name}"
 msgstr "замењено {new_name} са {old_name}"
 
-#: js/filelist.js:463
+#: js/filelist.js:508
 msgid "undo"
 msgstr "опозови"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
+#: js/filelist.js:579 js/filelist.js:645 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
+#: js/filelist.js:580 js/filelist.js:646 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:541
+#: js/filelist.js:587
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:732 js/filelist.js:770
+#: js/filelist.js:789 js/filelist.js:827
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -192,53 +228,57 @@ msgstr[2] ""
 msgid "'.' is an invalid file name."
 msgstr "Датотека „.“ је неисправног имена."
 
-#: js/files.js:29
+#: js/files.js:27
 msgid "File name cannot be empty."
 msgstr "Име датотеке не може бити празно."
 
-#: js/files.js:37
+#: js/files.js:34
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Неисправан назив. Следећи знакови нису дозвољени: \\, /, <, >, :, \", |, ? и *."
 
-#: js/files.js:51
+#: js/files.js:46
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Ваше складиште је пуно. Датотеке више не могу бити ажуриране ни синхронизоване."
 
-#: js/files.js:55
+#: js/files.js:50
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ваше складиште је скоро па пуно ({usedSpacePercent}%)"
 
-#: js/files.js:68
+#: js/files.js:63
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:72
+#: js/files.js:67
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:76
+#: js/files.js:71
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:307
+#: js/files.js:302
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Припремам преузимање. Ово може да потраје ако су датотеке велике."
 
-#: js/files.js:518 js/files.js:556
+#: js/files.js:514 js/files.js:552
 msgid "Error moving file"
 msgstr ""
 
+#: js/files.js:514 js/files.js:552
+msgid "Error"
+msgstr "Грешка"
+
 #: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "Име"
@@ -251,7 +291,11 @@ msgstr "Величина"
 msgid "Modified"
 msgstr "Измењено"
 
-#: lib/app.php:73
+#: lib/app.php:60
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:88
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
@@ -317,8 +361,8 @@ msgid "Cancel upload"
 msgstr "Прекини отпремање"
 
 #: templates/index.php:40
-msgid "You don’t have write permissions here."
-msgstr "Овде немате дозволу за писање."
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
 
 #: templates/index.php:45
 msgid "Nothing in here. Upload something!"
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index d70e237a46c..7c37f834309 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-17 13:47-0400\n"
-"PO-Revision-Date: 2013-10-17 17:47+0000\n"
+"POT-Creation-Date: 2013-10-27 02:28-0400\n"
+"PO-Revision-Date: 2013-10-23 10:41+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -24,31 +24,31 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:254
+#: private/app.php:255
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:359
+#: private/app.php:360
 msgid "Help"
 msgstr "Помоћ"
 
-#: private/app.php:372
+#: private/app.php:373
 msgid "Personal"
 msgstr "Лично"
 
-#: private/app.php:383
+#: private/app.php:384
 msgid "Settings"
 msgstr "Поставке"
 
-#: private/app.php:395
+#: private/app.php:396
 msgid "Users"
 msgstr "Корисници"
 
-#: private/app.php:408
+#: private/app.php:409
 msgid "Admin"
 msgstr "Администратор"
 
-#: private/app.php:872
+#: private/app.php:873
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -284,58 +284,58 @@ msgstr "Погледајте <a href='%s'>водиче за инсталациј
 msgid "Could not find category \"%s\""
 msgstr "Не могу да пронађем категорију „%s“."
 
-#: private/template/functions.php:122
+#: private/template/functions.php:130
 msgid "seconds ago"
 msgstr "пре неколико секунди"
 
-#: private/template/functions.php:123
+#: private/template/functions.php:131
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:124
+#: private/template/functions.php:132
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:125
+#: private/template/functions.php:133
 msgid "today"
 msgstr "данас"
 
-#: private/template/functions.php:126
+#: private/template/functions.php:134
 msgid "yesterday"
 msgstr "јуче"
 
-#: private/template/functions.php:128
+#: private/template/functions.php:136
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:138
 msgid "last month"
 msgstr "прошлог месеца"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:139
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:141
 msgid "last year"
 msgstr "прошле године"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:142
 msgid "years ago"
 msgstr "година раније"
 
-#: private/template.php:297
+#: private/template.php:297 public/util.php:103
 msgid "Caused by:"
 msgstr ""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 23b31d8fd85..69df73c35c3 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-21 13:01-0400\n"
-"PO-Revision-Date: 2013-10-21 17:01+0000\n"
+"POT-Creation-Date: 2013-10-27 02:28-0400\n"
+"PO-Revision-Date: 2013-10-27 06:28+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -210,6 +210,10 @@ msgstr "Грешка при прављењу корисника"
 msgid "A valid password must be provided"
 msgstr "Морате унети исправну лозинку"
 
+#: js/users.js:472
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
 #: personal.php:45 personal.php:46
 msgid "__language_name__"
 msgstr "__language_name__"
@@ -538,8 +542,8 @@ msgstr "WebDAV"
 #: templates/personal.php:135
 #, php-format
 msgid ""
-"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
-"target=\"_blank\">access your Files via WebDAV</a>"
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
 msgstr ""
 
 #: templates/personal.php:146
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index 7838f709e1a..167e454e779 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:27+0000\n"
+"POT-Creation-Date: 2013-10-27 02:28-0400\n"
+"PO-Revision-Date: 2013-10-27 06:30+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -41,298 +41,397 @@ msgid ""
 "details."
 msgstr ""
 
-#: js/settings.js:66
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:78
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:86
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
 msgid "Deletion failed"
 msgstr "Брисање није успело"
 
-#: js/settings.js:82
+#: js/settings.js:83
 msgid "Take over settings from recent server configuration?"
 msgstr ""
 
-#: js/settings.js:83
+#: js/settings.js:84
 msgid "Keep settings?"
 msgstr ""
 
-#: js/settings.js:97
+#: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:111
+#: js/settings.js:113
 msgid "mappings cleared"
 msgstr ""
 
-#: js/settings.js:112
+#: js/settings.js:114
 msgid "Success"
 msgstr ""
 
-#: js/settings.js:117
+#: js/settings.js:119
 msgid "Error"
 msgstr "Грешка"
 
-#: js/settings.js:141
+#: js/settings.js:660 js/settings.js:669
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:663 js/settings.js:672
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:666
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:694
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:146
+#: js/settings.js:699
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:156
+#: js/settings.js:709
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:157
+#: js/settings.js:710
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:9
-msgid ""
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behavior. Please ask your system administrator to "
-"disable one of them."
+#: lib/wizard.php:78 lib/wizard.php:92
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: lib/wizard.php:123
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: lib/wizard.php:752 lib/wizard.php:764
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:910
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:13
+msgid "Help"
+msgstr "Помоћ"
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Limit the access to %s to groups meeting this criteria:"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
 msgid ""
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
-"work. Please ask your system administrator to install it."
+"The filter specifies which LDAP groups shall have access to the %s instance."
 msgstr ""
 
-#: templates/settings.php:16
-msgid "Server configuration"
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/part.wizard-loginfilter.php:4
+msgid "What attribute shall be used as login name:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Домаћин"
 
-#: templates/settings.php:39
+#: templates/part.wizard-server.php:31
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Можете да изоставите протокол, осим ако захтевате SSL. У том случају почните са ldaps://."
 
-#: templates/settings.php:40
-msgid "Base DN"
-msgstr "База DN"
-
-#: templates/settings.php:41
-msgid "One Base DN per line"
-msgstr ""
-
-#: templates/settings.php:42
-msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr "Порт"
 
-#: templates/settings.php:44
+#: templates/part.wizard-server.php:44
 msgid "User DN"
 msgstr "Корисник DN"
 
-#: templates/settings.php:46
+#: templates/part.wizard-server.php:45
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
 msgstr "DN корисника клијента са којим треба да се успостави веза, нпр. uid=agent,dc=example,dc=com. За анониман приступ, оставите поља DN и лозинка празним."
 
-#: templates/settings.php:47
+#: templates/part.wizard-server.php:52
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/settings.php:50
+#: templates/part.wizard-server.php:53
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "За анониман приступ, оставите поља DN и лозинка празним."
 
-#: templates/settings.php:51
-msgid "User Login Filter"
-msgstr "Филтер за пријаву корисника"
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
+msgstr ""
 
-#: templates/settings.php:54
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:4
+#, php-format
+msgid "Limit the access to %s to users meeting this criteria:"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:31
 #, php-format
 msgid ""
-"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action. Example: \"uid=%%uid\""
+"The filter specifies which LDAP users shall have access to the %s instance."
 msgstr ""
 
-#: templates/settings.php:55
-msgid "User List Filter"
-msgstr "Филтер за списак корисника"
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
+msgstr ""
 
-#: templates/settings.php:58
-msgid ""
-"Defines the filter to apply, when retrieving users (no placeholders). "
-"Example: \"objectClass=person\""
+#: templates/part.wizardcontrols.php:4
+msgid "Back"
+msgstr "Назад"
+
+#: templates/part.wizardcontrols.php:7
+msgid "Continue"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Group Filter"
-msgstr "Филтер групе"
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:14
 msgid ""
-"Defines the filter to apply, when retrieving groups (no placeholders). "
-"Example: \"objectClass=posixGroup\""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:66
+#: templates/settings.php:20
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:22
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:22
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:69
-msgid "Port"
-msgstr "Порт"
+#: templates/settings.php:23
+msgid "User Login Filter"
+msgstr "Филтер за пријаву корисника"
 
-#: templates/settings.php:70
+#: templates/settings.php:26
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:27
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:27
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:28
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:29
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:29
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:73
-msgid "Use TLS"
-msgstr "Користи TLS"
-
-#: templates/settings.php:73
-msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
-
-#: templates/settings.php:74
+#: templates/settings.php:30
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP сервер осетљив на велика и мала слова (Windows)"
 
-#: templates/settings.php:75
+#: templates/settings.php:31
 msgid "Turn off SSL certificate validation."
 msgstr "Искључите потврду SSL сертификата."
 
-#: templates/settings.php:75
+#: templates/settings.php:31
 #, php-format
 msgid ""
 "Not recommended, use it for testing only! If connection only works with this"
 " option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:32
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:32
 msgid "in seconds. A change empties the cache."
 msgstr "у секундама. Промена испражњава кеш меморију."
 
-#: templates/settings.php:78
+#: templates/settings.php:34
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:36
 msgid "User Display Name Field"
 msgstr "Име приказа корисника"
 
-#: templates/settings.php:80
+#: templates/settings.php:36
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:37
 msgid "Base User Tree"
 msgstr "Основно стабло корисника"
 
-#: templates/settings.php:81
+#: templates/settings.php:37
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:38
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:82 templates/settings.php:85
+#: templates/settings.php:38 templates/settings.php:41
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:39
 msgid "Group Display Name Field"
 msgstr "Име приказа групе"
 
-#: templates/settings.php:83
+#: templates/settings.php:39
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:40
 msgid "Base Group Tree"
 msgstr "Основна стабло група"
 
-#: templates/settings.php:84
+#: templates/settings.php:40
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:41
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:42
 msgid "Group-Member association"
 msgstr "Придруживање чланова у групу"
 
-#: templates/settings.php:88
+#: templates/settings.php:44
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:46
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:47
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:47
 msgid "in bytes"
 msgstr "у бајтовима"
 
-#: templates/settings.php:92
+#: templates/settings.php:48
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:49
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:49
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:98
+#: templates/settings.php:55
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:56
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -348,15 +447,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:57
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:58
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:59
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -367,19 +466,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:60
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:61
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:62
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:63
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -393,18 +492,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:64
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:64
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
-
-#: templates/settings.php:109
-msgid "Test Configuration"
-msgstr ""
-
-#: templates/settings.php:109
-msgid "Help"
-msgstr "Помоћ"