Merge branch 'master' into filesystem

1 files changed, 64 insertions, 16 deletions

diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 9448d408c2f..5d5d14a2109 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:13+0200\n"
-"PO-Revision-Date: 2012-09-21 23:14+0000\n"
+"POT-Creation-Date: 2012-09-26 13:19+0200\n"
+"PO-Revision-Date: 2012-09-26 11:20+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -64,39 +64,39 @@ msgstr "Обриши"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:188 js/filelist.js:190
+#: js/filelist.js:190 js/filelist.js:192
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:188 js/filelist.js:190
+#: js/filelist.js:190 js/filelist.js:192
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:188
+#: js/filelist.js:190
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:188 js/filelist.js:190
+#: js/filelist.js:190 js/filelist.js:192
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:237 js/filelist.js:239
+#: js/filelist.js:239 js/filelist.js:241
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
+#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:239
+#: js/filelist.js:241
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:273
 msgid "unshared"
 msgstr ""
 
-#: js/filelist.js:273
+#: js/filelist.js:275
 msgid "deleted"
 msgstr ""
 
@@ -116,7 +116,15 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:355
+#: js/files.js:256
+msgid "1 file uploading"
+msgstr ""
+
+#: js/files.js:259 js/files.js:304 js/files.js:319
+msgid "files uploading"
+msgstr ""
+
+#: js/files.js:322 js/files.js:355
 msgid "Upload cancelled."
 msgstr ""
 
@@ -137,6 +145,10 @@ msgstr ""
 msgid "error while scanning"
 msgstr ""
 
+#: js/files.js:748 templates/index.php:48
+msgid "Name"
+msgstr "Име"
+
 #: js/files.js:749 templates/index.php:56
 msgid "Size"
 msgstr "Величина"
@@ -161,6 +173,46 @@ msgstr ""
 msgid "files"
 msgstr ""
 
+#: js/files.js:833
+msgid "seconds ago"
+msgstr ""
+
+#: js/files.js:834
+msgid "minute ago"
+msgstr ""
+
+#: js/files.js:835
+msgid "minutes ago"
+msgstr ""
+
+#: js/files.js:838
+msgid "today"
+msgstr ""
+
+#: js/files.js:839
+msgid "yesterday"
+msgstr ""
+
+#: js/files.js:840
+msgid "days ago"
+msgstr ""
+
+#: js/files.js:841
+msgid "last month"
+msgstr ""
+
+#: js/files.js:843
+msgid "months ago"
+msgstr ""
+
+#: js/files.js:844
+msgid "last year"
+msgstr ""
+
+#: js/files.js:845
+msgid "years ago"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -221,10 +273,6 @@ msgstr ""
 msgid "Nothing in here. Upload something!"
 msgstr "Овде нема ничег. Пошаљите нешто!"
 
-#: templates/index.php:48
-msgid "Name"
-msgstr "Име"
-
 #: templates/index.php:50
 msgid "Share"
 msgstr ""