merge master into filesytem

3 files changed, 81 insertions, 73 deletions

diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 2387a6610f3..d7711dff1bf 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/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: 2013-01-14 00:17+0100\n"
-"PO-Revision-Date: 2013-01-13 10:49+0000\n"
-"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,11 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr "Enviar"
+
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
@@ -33,46 +38,46 @@ msgstr "Non se puido mover %s"
 msgid "Unable to rename file"
 msgstr "Non se pode renomear o ficheiro"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:20
 msgid "No file was uploaded. Unknown error"
 msgstr "Non se subiu ningún ficheiro. Erro descoñecido."
 
-#: ajax/upload.php:21
+#: ajax/upload.php:30
 msgid "There is no error, the file uploaded with success"
 msgstr "Non hai erros. O ficheiro enviouse correctamente"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:31
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "O ficheiro subido excede a directiva indicada polo tamaño_máximo_de_subida de php.ini"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:33
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "O ficheiro enviado supera a directiva MAX_FILE_SIZE que foi indicada no formulario HTML"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:35
 msgid "The uploaded file was only partially uploaded"
 msgstr "O ficheiro enviado foi só parcialmente enviado"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:36
 msgid "No file was uploaded"
 msgstr "Non se enviou ningún ficheiro"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:37
 msgid "Missing a temporary folder"
 msgstr "Falta un cartafol temporal"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:38
 msgid "Failed to write to disk"
 msgstr "Erro ao escribir no disco"
 
-#: ajax/upload.php:45
+#: ajax/upload.php:57
 msgid "Not enough space available"
 msgstr "O espazo dispoñíbel é insuficiente"
 
-#: ajax/upload.php:69
+#: ajax/upload.php:91
 msgid "Invalid directory."
 msgstr "O directorio é incorrecto."
 
@@ -128,98 +133,100 @@ msgstr "{files} sen compartir"
 msgid "deleted {files}"
 msgstr "{files} eliminados"
 
-#: js/files.js:31
+#: js/files.js:48
 msgid "'.' is an invalid file name."
 msgstr "'.' é un nonme de ficheiro non válido"
 
-#: js/files.js:36
+#: js/files.js:53
 msgid "File name cannot be empty."
 msgstr "O nome de ficheiro non pode estar baldeiro"
 
-#: js/files.js:45
+#: js/files.js:62
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nome non válido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non se permiten."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "xerando un ficheiro ZIP, o que pode levar un anaco."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
 
-#: js/files.js:224
+#: js/files.js:242
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Non se puido subir o ficheiro pois ou é un directorio ou ten 0 bytes"
 
-#: js/files.js:224
+#: js/files.js:242
 msgid "Upload Error"
 msgstr "Erro na subida"
 
-#: js/files.js:241
+#: js/files.js:259
 msgid "Close"
 msgstr "Pechar"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
 msgid "Pending"
 msgstr "Pendentes"
 
-#: js/files.js:280
+#: js/files.js:298
 msgid "1 file uploading"
 msgstr "1 ficheiro subíndose"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
 msgid "{count} files uploading"
 msgstr "{count} ficheiros subíndose"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/files.js:464
+#: js/files.js:486
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "A subida do ficheiro está en curso. Saír agora da páxina cancelará a subida."
 
-#: js/files.js:537
+#: js/files.js:559
 msgid "URL cannot be empty."
 msgstr "URL non pode quedar baleiro."
 
-#: js/files.js:543
+#: js/files.js:565
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome de cartafol non válido. O uso de 'Shared' está reservado por Owncloud"
 
-#: js/files.js:727
+#: js/files.js:775
 msgid "{count} files scanned"
 msgstr "{count} ficheiros escaneados"
 
-#: js/files.js:735
+#: js/files.js:783
 msgid "error while scanning"
 msgstr "erro mentres analizaba"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:829
+#: js/files.js:878
 msgid "1 folder"
 msgstr "1 cartafol"
 
-#: js/files.js:831
+#: js/files.js:880
 msgid "{count} folders"
 msgstr "{count} cartafoles"
 
-#: js/files.js:839
+#: js/files.js:888
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/files.js:841
+#: js/files.js:890
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
@@ -271,10 +278,6 @@ msgstr "Cartafol"
 msgid "From link"
 msgstr "Dende a ligazón"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Enviar"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Cancelar a subida"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index 739b0ba67ff..21150b035b8 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-08 00:10+0100\n"
-"PO-Revision-Date: 2012-12-06 11:56+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,51 +20,55 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:287
+#: app.php:301
 msgid "Help"
 msgstr "Axuda"
 
-#: app.php:294
+#: app.php:308
 msgid "Personal"
 msgstr "Persoal"
 
-#: app.php:299
+#: app.php:313
 msgid "Settings"
 msgstr "Configuracións"
 
-#: app.php:304
+#: app.php:318
 msgid "Users"
 msgstr "Usuarios"
 
-#: app.php:311
+#: app.php:325
 msgid "Apps"
 msgstr "Aplicativos"
 
-#: app.php:313
+#: app.php:327
 msgid "Admin"
 msgstr "Administración"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "As descargas ZIP están desactivadas"
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Os ficheiros necesitan seren descargados de un en un."
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "Volver aos ficheiros"
 
-#: files.php:386
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip."
 
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "O aplicativo non está activado"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Produciuse un erro na autenticación"
 
@@ -84,55 +88,55 @@ msgstr "Texto"
 msgid "Images"
 msgstr "Imaxes"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "hai segundos"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "hai 1 minuto"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "hai %d minutos"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "Vai 1 hora"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "Vai %d horas"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "hoxe"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "onte"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "hai %d días"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "último mes"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "Vai %d meses"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "último ano"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "anos atrás"
 
diff --git a/l10n/gl/user_webdavauth.po b/l10n/gl/user_webdavauth.po
index 48aed85ad94..2004bb9b3c3 100644
--- a/l10n/gl/user_webdavauth.po
+++ b/l10n/gl/user_webdavauth.po
@@ -5,13 +5,14 @@
 # Translators:
 #   <mbouzada@gmail.com>, 2012.
 # Miguel Branco, 2012.
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-19 00:04+0100\n"
+"PO-Revision-Date: 2013-01-18 06:15+0000\n"
+"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +22,7 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "WebDAV Authentication"
-msgstr ""
+msgstr "Autenticación WebDAV"
 
 #: templates/settings.php:4
 msgid "URL: http://"
@@ -32,4 +33,4 @@ msgid ""
 "ownCloud will send the user credentials to this URL. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr ""
+msgstr "ownCloud enviará as credenciais do usuario a esta URL. Este conector comproba a resposta e interpretará os códigos de estado 401 e 403 como credenciais non válidas, e todas as outras respostas como credenciais válidas."