Merge branch 'master' into oc_error

1 files changed, 56 insertions, 16 deletions

diff --git a/l10n/el/files.po b/l10n/el/files.po
index c564866ebc1..87cbcd3e9b1 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-05-13 19:52+0200\n"
-"PO-Revision-Date: 2012-05-10 16:48+0000\n"
-"Last-Translator: Marios Bekatoros <>\n"
+"POT-Creation-Date: 2012-06-06 00:12+0200\n"
+"PO-Revision-Date: 2012-06-05 22:15+0000\n"
+"Last-Translator: icewind <icewind1991@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,62 @@ msgstr "Λείπει ένας προσωρινός φάκελος"
 msgid "Failed to write to disk"
 msgstr "Η εγγραφή στο δίσκο απέτυχε"
 
-#: appinfo/app.php:7
+#: appinfo/app.php:6
 msgid "Files"
 msgstr "Αρχεία"
 
+#: js/filelist.js:186
+msgid "undo deletion"
+msgstr ""
+
+#: js/files.js:170
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:199
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:199
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:227 js/files.js:318 js/files.js:347
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:332
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:456
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:626 templates/index.php:55
+msgid "Size"
+msgstr "Μέγεθος"
+
+#: js/files.js:627 templates/index.php:56
+msgid "Modified"
+msgstr "Τροποποιήθηκε"
+
+#: js/files.js:654
+msgid "folder"
+msgstr ""
+
+#: js/files.js:656
+msgid "folders"
+msgstr ""
+
+#: js/files.js:664
+msgid "file"
+msgstr ""
+
+#: js/files.js:666
+msgid "files"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Διαχείριση αρχείων"
@@ -121,18 +173,6 @@ msgstr "Διαμοίρασε"
 msgid "Download"
 msgstr "Λήψη"
 
-#: templates/index.php:55
-msgid "Size"
-msgstr "Μέγεθος"
-
-#: templates/index.php:56
-msgid "Modified"
-msgstr "Τροποποιήθηκε"
-
-#: templates/index.php:56
-msgid "Delete all"
-msgstr "Διαγραφή όλων"
-
 #: templates/index.php:56
 msgid "Delete"
 msgstr "Διαγραφή"