aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files/ajax/newfile.php1
-rw-r--r--apps/files/appinfo/remote.php2
-rw-r--r--apps/files/js/files.js2
-rw-r--r--apps/files/l10n/ca.php1
-rw-r--r--apps/files/l10n/cs_CZ.php1
-rw-r--r--apps/files/l10n/de.php2
-rw-r--r--apps/files/l10n/de_DE.php2
-rw-r--r--apps/files/l10n/es.php2
-rw-r--r--apps/files/l10n/eu.php16
-rw-r--r--apps/files/l10n/fr.php2
-rw-r--r--apps/files/l10n/it.php1
-rw-r--r--apps/files/l10n/nl.php2
-rw-r--r--apps/files/l10n/pt_PT.php1
-rw-r--r--apps/files/l10n/sl.php2
-rw-r--r--apps/files/l10n/ta_LK.php2
-rw-r--r--apps/files/l10n/zh_CN.php2
-rw-r--r--apps/files_external/l10n/ta_LK.php24
-rw-r--r--apps/user_webdavauth/l10n/eu.php3
-rw-r--r--apps/user_webdavauth/l10n/fr.php3
-rw-r--r--config/config.sample.php6
-rw-r--r--core/js/eventsource.js15
-rw-r--r--core/l10n/eu.php7
-rw-r--r--core/l10n/fr.php11
-rw-r--r--l10n/ca/files.po8
-rw-r--r--l10n/cs_CZ/files.po8
-rw-r--r--l10n/de/files.po9
-rw-r--r--l10n/de_DE/files.po9
-rw-r--r--l10n/es/files.po11
-rw-r--r--l10n/eu/core.po96
-rw-r--r--l10n/eu/files.po36
-rw-r--r--l10n/eu/settings.po10
-rw-r--r--l10n/eu/user_webdavauth.po9
-rw-r--r--l10n/fr/core.po108
-rw-r--r--l10n/fr/files.po10
-rw-r--r--l10n/fr/lib.po22
-rw-r--r--l10n/fr/user_webdavauth.po9
-rw-r--r--l10n/it/files.po8
-rw-r--r--l10n/nl/files.po10
-rw-r--r--l10n/pt_PT/files.po8
-rw-r--r--l10n/sl/files.po10
-rw-r--r--l10n/ta_LK/files.po10
-rw-r--r--l10n/ta_LK/files_external.po51
-rw-r--r--l10n/templates/core.pot2
-rw-r--r--l10n/templates/files.pot2
-rw-r--r--l10n/templates/files_encryption.pot2
-rw-r--r--l10n/templates/files_external.pot2
-rw-r--r--l10n/templates/files_sharing.pot2
-rw-r--r--l10n/templates/files_versions.pot2
-rw-r--r--l10n/templates/lib.pot2
-rw-r--r--l10n/templates/settings.pot2
-rw-r--r--l10n/templates/user_ldap.pot2
-rw-r--r--l10n/templates/user_webdavauth.pot2
-rw-r--r--l10n/zh_CN/files.po11
-rw-r--r--lib/db.php17
-rw-r--r--lib/l10n/fr.php6
-rw-r--r--settings/l10n/eu.php2
56 files changed, 363 insertions, 245 deletions
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index b87079f2712..2bac9bb20ba 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -65,6 +65,7 @@ if($source) {
$target=$dir.'/'.$filename;
$result=OC_Filesystem::file_put_contents($target, $sourceStream);
if($result) {
+ $target = OC_Filesystem::normalizePath($target);
$meta = OC_FileCache::get($target);
$mime=$meta['mimetype'];
$id = OC_FileCache::getId($target);
diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index 400a978fb17..0ab7e7674c6 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -27,6 +27,8 @@ $RUNTIME_APPTYPES=array('filesystem', 'authentication', 'logging');
OC_App::loadApps($RUNTIME_APPTYPES);
+ob_end_clean();
+
// Backends
$authBackend = new OC_Connector_Sabre_Auth();
$lockBackend = new OC_Connector_Sabre_Locks();
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 28d4b49670d..dbd9a647151 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -864,7 +864,7 @@ function getMimeIcon(mime, ready){
if(getMimeIcon.cache[mime]){
ready(getMimeIcon.cache[mime]);
}else{
- $.get( OC.filePath('files','ajax','mimeicon.php')+'?mime='+mime, function(path){
+ $.get( OC.filePath('files','ajax','mimeicon.php')+'&mime='+mime, function(path){
getMimeIcon.cache[mime]=path;
ready(getMimeIcon.cache[mime]);
});
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index a2d5bddbfc2..de72d3f46fd 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -19,6 +19,7 @@
"replaced {new_name} with {old_name}" => "s'ha substituït {old_name} per {new_name}",
"unshared {files}" => "no compartits {files}",
"deleted {files}" => "eliminats {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos.",
"generating ZIP-file, it may take some time." => "s'estan generant fitxers ZIP, pot trigar una estona.",
"Unable to upload your file as it is a directory or has 0 bytes" => "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes",
"Upload Error" => "Error en la pujada",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 75613a34d23..22a9353290f 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -19,6 +19,7 @@
"replaced {new_name} with {old_name}" => "nahrazeno {new_name} s {old_name}",
"unshared {files}" => "sdílení zrušeno pro {files}",
"deleted {files}" => "smazáno {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.",
"generating ZIP-file, it may take some time." => "generuji ZIP soubor, může to nějakou dobu trvat.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů",
"Upload Error" => "Chyba odesílání",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 4abfc8c432c..88c1e792ae6 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -19,6 +19,7 @@
"replaced {new_name} with {old_name}" => "{old_name} ersetzt durch {new_name}",
"unshared {files}" => "Freigabe von {files} aufgehoben",
"deleted {files}" => "{files} gelöscht",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
"generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Deine Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.",
"Upload Error" => "Fehler beim Upload",
@@ -28,6 +29,7 @@
"{count} files uploading" => "{count} Dateien werden hochgeladen",
"Upload cancelled." => "Upload abgebrochen.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten.",
"{count} files scanned" => "{count} Dateien wurden gescannt",
"error while scanning" => "Fehler beim Scannen",
"Name" => "Name",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 7ba7600a0d7..427380e5a21 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -19,6 +19,7 @@
"replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}",
"unshared {files}" => "Freigabe für {files} beendet",
"deleted {files}" => "{files} gelöscht",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
"generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.",
"Upload Error" => "Fehler beim Upload",
@@ -28,6 +29,7 @@
"{count} files uploading" => "{count} Dateien wurden hochgeladen",
"Upload cancelled." => "Upload abgebrochen.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Der Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten.",
"{count} files scanned" => "{count} Dateien wurden gescannt",
"error while scanning" => "Fehler beim Scannen",
"Name" => "Name",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 7bc4fa64ae2..e946c7e7cc6 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -19,6 +19,7 @@
"replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}",
"unshared {files}" => "{files} descompartidos",
"deleted {files}" => "{files} eliminados",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
"generating ZIP-file, it may take some time." => "generando un fichero ZIP, puede llevar un tiempo.",
"Unable to upload your file as it is a directory or has 0 bytes" => "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes",
"Upload Error" => "Error al subir el archivo",
@@ -28,6 +29,7 @@
"{count} files uploading" => "Subiendo {count} archivos",
"Upload cancelled." => "Subida cancelada.",
"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Salir de la página ahora cancelará la subida.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Nombre de la carpeta invalido. El uso de \"Shared\" esta reservado para Owncloud",
"{count} files scanned" => "{count} archivos escaneados",
"error while scanning" => "error escaneando",
"Name" => "Nombre",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index dddb58e9cb5..062ae33fb66 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -7,25 +7,38 @@
"Missing a temporary folder" => "Aldi baterako karpeta falta da",
"Failed to write to disk" => "Errore bat izan da diskoan idazterakoan",
"Files" => "Fitxategiak",
-"Unshare" => "Ez partekatu",
+"Unshare" => "Ez elkarbanatu",
"Delete" => "Ezabatu",
"Rename" => "Berrizendatu",
+"{new_name} already exists" => "{new_name} dagoeneko existitzen da",
"replace" => "ordeztu",
"suggest name" => "aholkatu izena",
"cancel" => "ezeztatu",
+"replaced {new_name}" => "ordezkatua {new_name}",
"undo" => "desegin",
+"replaced {new_name} with {old_name}" => " {new_name}-k {old_name} ordezkatu du",
+"unshared {files}" => "elkarbanaketa utzita {files}",
+"deleted {files}" => "ezabatuta {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.",
"generating ZIP-file, it may take some time." => "ZIP-fitxategia sortzen ari da, denbora har dezake",
"Unable to upload your file as it is a directory or has 0 bytes" => "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu",
"Upload Error" => "Igotzean errore bat suertatu da",
"Close" => "Itxi",
"Pending" => "Zain",
"1 file uploading" => "fitxategi 1 igotzen",
+"{count} files uploading" => "{count} fitxategi igotzen",
"Upload cancelled." => "Igoera ezeztatuta",
"File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Karpeta izen baliogabea. \"Shared\" karpetaren erabilera Owncloudek erreserbatuta dauka",
+"{count} files scanned" => "{count} fitxategi eskaneatuta",
"error while scanning" => "errore bat egon da eskaneatzen zen bitartean",
"Name" => "Izena",
"Size" => "Tamaina",
"Modified" => "Aldatuta",
+"1 folder" => "karpeta bat",
+"{count} folders" => "{count} karpeta",
+"1 file" => "fitxategi bat",
+"{count} files" => "{count} fitxategi",
"File handling" => "Fitxategien kudeaketa",
"Maximum upload size" => "Igo daitekeen gehienezko tamaina",
"max. possible: " => "max, posiblea:",
@@ -37,6 +50,7 @@
"New" => "Berria",
"Text file" => "Testu fitxategia",
"Folder" => "Karpeta",
+"From link" => "Estekatik",
"Upload" => "Igo",
"Cancel upload" => "Ezeztatu igoera",
"Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 5170272c45a..97643c63632 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -19,6 +19,7 @@
"replaced {new_name} with {old_name}" => "{new_name} a été remplacé par {old_name}",
"unshared {files}" => "Fichiers non partagés : {files}",
"deleted {files}" => "Fichiers supprimés : {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.",
"generating ZIP-file, it may take some time." => "Fichier ZIP en cours d'assemblage ; cela peut prendre du temps.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet.",
"Upload Error" => "Erreur de chargement",
@@ -28,6 +29,7 @@
"{count} files uploading" => "{count} fichiers téléversés",
"Upload cancelled." => "Chargement annulé.",
"File upload is in progress. Leaving the page now will cancel the upload." => "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Nom de répertoire invalide. \"Shared\" est réservé par ownCloud",
"{count} files scanned" => "{count} fichiers indexés",
"error while scanning" => "erreur lors de l'indexation",
"Name" => "Nom",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index ff213aec29c..3b5ba8377f8 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -19,6 +19,7 @@
"replaced {new_name} with {old_name}" => "sostituito {new_name} con {old_name}",
"unshared {files}" => "non condivisi {files}",
"deleted {files}" => "eliminati {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti.",
"generating ZIP-file, it may take some time." => "creazione file ZIP, potrebbe richiedere del tempo.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte",
"Upload Error" => "Errore di invio",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index fee3f0831c9..14c3315c566 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -19,6 +19,7 @@
"replaced {new_name} with {old_name}" => "verving {new_name} met {old_name}",
"unshared {files}" => "delen gestopt {files}",
"deleted {files}" => "verwijderde {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan.",
"generating ZIP-file, it may take some time." => "aanmaken ZIP-file, dit kan enige tijd duren.",
"Unable to upload your file as it is a directory or has 0 bytes" => "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes",
"Upload Error" => "Upload Fout",
@@ -28,6 +29,7 @@
"{count} files uploading" => "{count} bestanden aan het uploaden",
"Upload cancelled." => "Uploaden geannuleerd.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Folder naam niet toegestaan. Het gebruik van \"Shared\" is aan Owncloud voorbehouden",
"{count} files scanned" => "{count} bestanden gescanned",
"error while scanning" => "Fout tijdens het scannen",
"Name" => "Naam",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index 266a282d6e8..5d14cccc4bc 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -19,6 +19,7 @@
"replaced {new_name} with {old_name}" => "substituido {new_name} por {old_name}",
"unshared {files}" => "{files} não partilhado(s)",
"deleted {files}" => "{files} eliminado(s)",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
"generating ZIP-file, it may take some time." => "a gerar o ficheiro ZIP, poderá demorar algum tempo.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Não é possível fazer o envio do ficheiro devido a ser uma pasta ou ter 0 bytes",
"Upload Error" => "Erro no envio",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 62cf7f72066..84754792e07 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -19,6 +19,7 @@
"replaced {new_name} with {old_name}" => "zamenjano ime {new_name} z imenom {old_name}",
"unshared {files}" => "odstranjeno iz souporabe {files}",
"deleted {files}" => "izbrisano {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neveljavno ime, znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni.",
"generating ZIP-file, it may take some time." => "Ustvarjanje datoteke ZIP. To lahko traja nekaj časa.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Pošiljanje ni mogoče, saj gre za mapo, ali pa je datoteka velikosti 0 bajtov.",
"Upload Error" => "Napaka med nalaganjem",
@@ -28,6 +29,7 @@
"{count} files uploading" => "nalagam {count} datotek",
"Upload cancelled." => "Pošiljanje je preklicano.",
"File upload is in progress. Leaving the page now will cancel the upload." => "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Neveljavno ime datoteke. Uporaba mape \"Share\" je rezervirana za ownCloud.",
"{count} files scanned" => "{count} files scanned",
"error while scanning" => "napaka med pregledovanjem datotek",
"Name" => "Ime",
diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php
index 0bd4b173c04..d9b6b021be3 100644
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@@ -19,6 +19,7 @@
"replaced {new_name} with {old_name}" => "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது",
"unshared {files}" => "பகிரப்படாதது {கோப்புகள்}",
"deleted {files}" => "நீக்கப்பட்டது {கோப்புகள்}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது.",
"generating ZIP-file, it may take some time." => " ZIP கோப்பு உருவாக்கப்படுகின்றது, இது சில நேரம் ஆகலாம்.",
"Unable to upload your file as it is a directory or has 0 bytes" => "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை",
"Upload Error" => "பதிவேற்றல் வழு",
@@ -28,6 +29,7 @@
"{count} files uploading" => "{எண்ணிக்கை} கோப்புகள் பதிவேற்றப்படுகின்றது",
"Upload cancelled." => "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது",
"File upload is in progress. Leaving the page now will cancel the upload." => "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "செல்லுபடியற்ற கோப்புறை பெயர். \"பகிர்வின்\" பாவனை Owncloud இனால் ஒதுக்கப்பட்டுள்ளது",
"{count} files scanned" => "{எண்ணிக்கை} கோப்புகள் வருடப்பட்டது",
"error while scanning" => "வருடும் போதான வழு",
"Name" => "பெயர்",
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 03efc3f22e4..f74692c6f9e 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -19,6 +19,7 @@
"replaced {new_name} with {old_name}" => "已将 {old_name}替换成 {new_name}",
"unshared {files}" => "取消了共享 {files}",
"deleted {files}" => "删除了 {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "无效名称,'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。",
"generating ZIP-file, it may take some time." => "正在生成 ZIP 文件,可能需要一些时间",
"Unable to upload your file as it is a directory or has 0 bytes" => "无法上传文件,因为它是一个目录或者大小为 0 字节",
"Upload Error" => "上传错误",
@@ -28,6 +29,7 @@
"{count} files uploading" => "{count} 个文件上传中",
"Upload cancelled." => "上传已取消",
"File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传中。现在离开此页会导致上传动作被取消。",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "无效的文件夹名称。”Shared“ 是 Owncloud 保留字符。",
"{count} files scanned" => "{count} 个文件已扫描。",
"error while scanning" => "扫描时出错",
"Name" => "名称",
diff --git a/apps/files_external/l10n/ta_LK.php b/apps/files_external/l10n/ta_LK.php
new file mode 100644
index 00000000000..1e01b22efa0
--- /dev/null
+++ b/apps/files_external/l10n/ta_LK.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Access granted" => "அனுமதி வழங்கப்பட்டது",
+"Error configuring Dropbox storage" => "Dropbox சேமிப்பை தகவமைப்பதில் வழு",
+"Grant access" => "அனுமதியை வழங்கல்",
+"Fill out all required fields" => "தேவையான எல்லா புலங்களையும் நிரப்புக",
+"Please provide a valid Dropbox app key and secret." => "தயவுசெய்து ஒரு செல்லுபடியான Dropbox செயலி சாவி மற்றும் இரகசியத்தை வழங்குக. ",
+"Error configuring Google Drive storage" => "Google இயக்க சேமிப்பகத்தை தகமைப்பதில் வழு",
+"External Storage" => "வெளி சேமிப்பு",
+"Mount point" => "ஏற்றப்புள்ளி",
+"Backend" => "பின்நிலை",
+"Configuration" => "தகவமைப்பு",
+"Options" => "தெரிவுகள்",
+"Applicable" => "பயன்படத்தக்க",
+"Add mount point" => "ஏற்றப்புள்ளியை சேர்க்க",
+"None set" => "தொகுப்பில்லா",
+"All Users" => "பயனாளர்கள் எல்லாம்",
+"Groups" => "குழுக்கள்",
+"Users" => "பயனாளர்",
+"Delete" => "நீக்குக",
+"Enable User External Storage" => "பயனாளர் வெளி சேமிப்பை இயலுமைப்படுத்துக",
+"Allow users to mount their own external storage" => "பயனாளர் அவர்களுடைய சொந்த வெளியக சேமிப்பை ஏற்ற அனுமதிக்க",
+"SSL root certificates" => "SSL வேர் சான்றிதழ்கள்",
+"Import Root Certificate" => "வேர் சான்றிதழை இறக்குமதி செய்க"
+);
diff --git a/apps/user_webdavauth/l10n/eu.php b/apps/user_webdavauth/l10n/eu.php
new file mode 100644
index 00000000000..9bd32954b05
--- /dev/null
+++ b/apps/user_webdavauth/l10n/eu.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"WebDAV URL: http://" => "WebDAV URL: http://"
+);
diff --git a/apps/user_webdavauth/l10n/fr.php b/apps/user_webdavauth/l10n/fr.php
new file mode 100644
index 00000000000..759d45b230e
--- /dev/null
+++ b/apps/user_webdavauth/l10n/fr.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"WebDAV URL: http://" => "URL WebDAV : http://"
+);
diff --git a/config/config.sample.php b/config/config.sample.php
index 0ef90a04699..f531d5f146b 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -119,4 +119,10 @@ $CONFIG = array(
'writable' => true,
),
),
+ 'user_backends'=>array(
+ array(
+ 'class'=>'OC_User_IMAP',
+ 'arguments'=>array('{imap.gmail.com:993/imap/ssl}INBOX')
+ )
+ )
);
diff --git a/core/js/eventsource.js b/core/js/eventsource.js
index e3ad7e3a671..0c2a995f331 100644
--- a/core/js/eventsource.js
+++ b/core/js/eventsource.js
@@ -42,7 +42,11 @@ OC.EventSource=function(src,data){
}
dataStr+='requesttoken='+OC.EventSource.requesttoken;
if(!this.useFallBack && typeof EventSource !='undefined'){
- this.source=new EventSource(src+'?'+dataStr);
+ var joinChar = '&';
+ if(src.indexOf('?') == -1) {
+ joinChar = '?';
+ }
+ this.source=new EventSource(src+joinChar+dataStr);
this.source.onmessage=function(e){
for(var i=0;i<this.typelessListeners.length;i++){
this.typelessListeners[i](JSON.parse(e.data));
@@ -54,7 +58,12 @@ OC.EventSource=function(src,data){
this.iframe=$('<iframe/>');
this.iframe.attr('id',iframeId);
this.iframe.hide();
- this.iframe.attr('src',src+'?fallback=true&fallback_id='+OC.EventSource.iframeCount+'&'+dataStr);
+
+ var joinChar = '&';
+ if(src.indexOf('?') == -1) {
+ joinChar = '?';
+ }
+ this.iframe.attr('src',src+joinChar+'fallback=true&fallback_id='+OC.EventSource.iframeCount+'&'+dataStr);
$('body').append(this.iframe);
this.useFallBack=true;
OC.EventSource.iframeCount++
@@ -90,7 +99,7 @@ OC.EventSource.prototype={
lastLength:0,//for fallback
listen:function(type,callback){
if(callback && callback.call){
-
+
if(type){
if(this.useFallBack){
if(!this.listeners[type]){
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 6622a822d08..8bc5d690d5b 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -1,6 +1,9 @@
<?php $TRANSLATIONS = array(
+"Category type not provided." => "Kategoria mota ez da zehaztu.",
"No category to add?" => "Ez dago gehitzeko kategoriarik?",
"This category already exists: " => "Kategoria hau dagoeneko existitzen da:",
+"Object type not provided." => "Objetu mota ez da zehaztu.",
+"%s ID not provided." => "%s ID mota ez da zehaztu.",
"No categories selected for deletion." => "Ez da ezabatzeko kategoriarik hautatu.",
"Settings" => "Ezarpenak",
"seconds ago" => "segundu",
@@ -96,5 +99,7 @@
"Log in" => "Hasi saioa",
"You are logged out." => "Zure saioa bukatu da.",
"prev" => "aurrekoa",
-"next" => "hurrengoa"
+"next" => "hurrengoa",
+"Security Warning!" => "Segurtasun abisua",
+"Verify" => "Egiaztatu"
);
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index a513ad19659..f02a7b0087c 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -1,15 +1,23 @@
<?php $TRANSLATIONS = array(
+"Category type not provided." => "Type de catégorie non spécifié.",
"No category to add?" => "Pas de catégorie à ajouter ?",
"This category already exists: " => "Cette catégorie existe déjà : ",
+"Object type not provided." => "Type d'objet non spécifié.",
+"%s ID not provided." => "L'identifiant de %s n'est pas spécifié.",
+"Error adding %s to favorites." => "Erreur lors de l'ajout de %s aux favoris.",
"No categories selected for deletion." => "Aucune catégorie sélectionnée pour suppression",
+"Error removing %s from favorites." => "Erreur lors de la suppression de %s des favoris.",
"Settings" => "Paramètres",
"seconds ago" => "il y a quelques secondes",
"1 minute ago" => "il y a une minute",
"{minutes} minutes ago" => "il y a {minutes} minutes",
+"1 hour ago" => "Il y a une heure",
+"{hours} hours ago" => "Il y a {hours} heures",
"today" => "aujourd'hui",
"yesterday" => "hier",
"{days} days ago" => "il y a {days} jours",
"last month" => "le mois dernier",
+"{months} months ago" => "Il y a {months} mois",
"months ago" => "il y a plusieurs mois",
"last year" => "l'année dernière",
"years ago" => "il y a plusieurs années",
@@ -18,7 +26,10 @@
"No" => "Non",
"Yes" => "Oui",
"Ok" => "Ok",
+"The object type is not specified." => "Le type d'objet n'est pas spécifié.",
"Error" => "Erreur",
+"The app name is not specified." => "Le nom de l'application n'est pas spécifié.",
+"The required file {file} is not installed!" => "Le fichier requis {file} n'est pas installé !",
"Error while sharing" => "Erreur lors de la mise en partage",
"Error while unsharing" => "Erreur lors de l'annulation du partage",
"Error while changing permissions" => "Erreur lors du changement des permissions",
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 4275de50fa2..f8f8371902b 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
-"PO-Revision-Date: 2012-11-23 23:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\n"
+"PO-Revision-Date: 2012-11-25 10:24+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -107,7 +107,7 @@ msgstr "eliminats {files}"
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr ""
+msgstr "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos."
#: js/files.js:183
msgid "generating ZIP-file, it may take some time."
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 9a02c9fbf07..16c8466439f 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.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-11-24 00:01+0100\n"
-"PO-Revision-Date: 2012-11-23 23:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-25 00:02+0100\n"
+"PO-Revision-Date: 2012-11-24 09:30+0000\n"
+"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -106,7 +106,7 @@ msgstr "smazáno {files}"
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr ""
+msgstr "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny."
#: js/files.js:183
msgid "generating ZIP-file, it may take some time."
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 0134a285f03..1a69a4a4cf6 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -5,6 +5,7 @@
# Translators:
# <admin@s-goecker.de>, 2012.
# <blobbyjj@ymail.com>, 2012.
+# I Robot <owncloud-bot@tmit.eu>, 2012.
# I Robot <thomas.mueller@tmit.eu>, 2012.
# Jan-Christoph Borchardt <hey@jancborchardt.net>, 2012.
# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
@@ -23,8 +24,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
-"PO-Revision-Date: 2012-11-23 23:01+0000\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\n"
+"PO-Revision-Date: 2012-11-25 00:10+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -119,7 +120,7 @@ msgstr "{files} gelöscht"
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr ""
+msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
#: js/files.js:183
msgid "generating ZIP-file, it may take some time."
@@ -160,7 +161,7 @@ msgstr "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload a
#: js/files.js:523
msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
-msgstr ""
+msgstr "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten."
#: js/files.js:704
msgid "{count} files scanned"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 0b8ace46ae3..336308b77b1 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -6,6 +6,7 @@
# <admin@s-goecker.de>, 2012.
# <a.tangemann@web.de>, 2012.
# <blobbyjj@ymail.com>, 2012.
+# I Robot <owncloud-bot@tmit.eu>, 2012.
# I Robot <thomas.mueller@tmit.eu>, 2012.
# Jan-Christoph Borchardt <hey@jancborchardt.net>, 2012.
# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
@@ -24,8 +25,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
-"PO-Revision-Date: 2012-11-23 23:02+0000\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\n"
+"PO-Revision-Date: 2012-11-25 00:13+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
@@ -120,7 +121,7 @@ msgstr "{files} gelöscht"
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr ""
+msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
#: js/files.js:183
msgid "generating ZIP-file, it may take some time."
@@ -161,7 +162,7 @@ msgstr "Der Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upl
#: js/files.js:523
msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
-msgstr ""
+msgstr "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten."
#: js/files.js:704
msgid "{count} files scanned"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 8f2e46f3f65..0e76c469e71 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Agustin Ferrario <>, 2012.
# <devianpctek@gmail.com>, 2012.
# Javier Llorente <javier@opensuse.org>, 2012.
# <juanma@kde.org.ar>, 2012.
@@ -13,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
-"PO-Revision-Date: 2012-11-23 23:01+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-25 00:02+0100\n"
+"PO-Revision-Date: 2012-11-24 15:20+0000\n"
+"Last-Translator: Agustin Ferrario <>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -109,7 +110,7 @@ msgstr "{files} eliminados"
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr ""
+msgstr "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos "
#: js/files.js:183
msgid "generating ZIP-file, it may take some time."
@@ -150,7 +151,7 @@ msgstr "La subida del archivo está en proceso. Salir de la página ahora cancel
#: js/files.js:523
msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
-msgstr ""
+msgstr "Nombre de la carpeta invalido. El uso de \"Shared\" esta reservado para Owncloud"
#: js/files.js:704
msgid "{count} files scanned"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 3aa27daaa80..1c55b9ec27e 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\n"
+"PO-Revision-Date: 2012-11-25 23:01+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
-msgstr ""
+msgstr "Kategoria mota ez da zehaztu."
#: ajax/vcategories/add.php:30
msgid "No category to add?"
@@ -35,13 +35,13 @@ msgstr "Kategoria hau dagoeneko existitzen da:"
#: ajax/vcategories/favorites.php:24
#: ajax/vcategories/removeFromFavorites.php:26
msgid "Object type not provided."
-msgstr ""
+msgstr "Objetu mota ez da zehaztu."
#: ajax/vcategories/addToFavorites.php:30
#: ajax/vcategories/removeFromFavorites.php:30
#, php-format
msgid "%s ID not provided."
-msgstr ""
+msgstr "%s ID mota ez da zehaztu."
#: ajax/vcategories/addToFavorites.php:35
#, php-format
@@ -57,59 +57,59 @@ msgstr "Ez da ezabatzeko kategoriarik hautatu."
msgid "Error removing %s from favorites."
msgstr ""
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
msgid "Settings"
msgstr "Ezarpenak"
-#: js/js.js:688
+#: js/js.js:704
msgid "seconds ago"
msgstr "segundu"
-#: js/js.js:689
+#: js/js.js:705
msgid "1 minute ago"
msgstr "orain dela minutu 1"
-#: js/js.js:690
+#: js/js.js:706
msgid "{minutes} minutes ago"
msgstr ""
-#: js/js.js:691
+#: js/js.js:707
msgid "1 hour ago"
msgstr ""
-#: js/js.js:692
+#: js/js.js:708
msgid "{hours} hours ago"
msgstr ""
-#: js/js.js:693
+#: js/js.js:709
msgid "today"
msgstr "gaur"
-#: js/js.js:694
+#: js/js.js:710
msgid "yesterday"
msgstr "atzo"
-#: js/js.js:695
+#: js/js.js:711
msgid "{days} days ago"
msgstr ""
-#: js/js.js:696
+#: js/js.js:712
msgid "last month"
msgstr "joan den hilabetean"
-#: js/js.js:697
+#: js/js.js:713
msgid "{months} months ago"
msgstr ""
-#: js/js.js:698
+#: js/js.js:714
msgid "months ago"
msgstr "hilabete"
-#: js/js.js:699
+#: js/js.js:715
msgid "last year"
msgstr "joan den urtean"
-#: js/js.js:700
+#: js/js.js:716
msgid "years ago"
msgstr "urte"
@@ -139,8 +139,8 @@ msgid "The object type is not specified."
msgstr ""
#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:527
+#: js/share.js:539
msgid "Error"
msgstr "Errorea"
@@ -241,15 +241,15 @@ msgstr "ezabatu"
msgid "share"
msgstr "elkarbanatu"
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:343 js/share.js:514 js/share.js:516
msgid "Password protected"
msgstr "Pasahitzarekin babestuta"
-#: js/share.js:525
+#: js/share.js:527
msgid "Error unsetting expiration date"
msgstr "Errorea izan da muga data kentzean"
-#: js/share.js:537
+#: js/share.js:539
msgid "Error setting expiration date"
msgstr "Errore bat egon da muga data ezartzean"
@@ -404,87 +404,87 @@ msgstr "Datubasearen hostalaria"
msgid "Finish setup"
msgstr "Bukatu konfigurazioa"
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
msgid "Sunday"
msgstr "Igandea"
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
msgid "Monday"
msgstr "Astelehena"
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
msgid "Tuesday"
msgstr "Asteartea"
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
msgid "Wednesday"
msgstr "Asteazkena"
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
msgid "Thursday"
msgstr "Osteguna"
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
msgid "Friday"
msgstr "Ostirala"
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
msgid "Saturday"
msgstr "Larunbata"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "January"
msgstr "Urtarrila"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "February"
msgstr "Otsaila"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "March"
msgstr "Martxoa"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "April"
msgstr "Apirila"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "May"
msgstr "Maiatza"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "June"
msgstr "Ekaina"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "July"
msgstr "Uztaila"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "August"
msgstr "Abuztua"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "September"
msgstr "Iraila"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "October"
msgstr "Urria"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "November"
msgstr "Azaroa"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "December"
msgstr "Abendua"
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
msgid "web services under your control"
msgstr "web zerbitzuak zure kontrolpean"
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
msgid "Log out"
msgstr "Saioa bukatu"
@@ -528,7 +528,7 @@ msgstr "hurrengoa"
#: templates/verify.php:5
msgid "Security Warning!"
-msgstr ""
+msgstr "Segurtasun abisua"
#: templates/verify.php:6
msgid ""
@@ -538,4 +538,4 @@ msgstr ""
#: templates/verify.php:16
msgid "Verify"
-msgstr ""
+msgstr "Egiaztatu"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index a726851e138..2f667de1c6d 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/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-11-24 00:01+0100\n"
-"PO-Revision-Date: 2012-11-23 23:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\n"
+"PO-Revision-Date: 2012-11-25 23:00+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +55,7 @@ msgstr "Fitxategiak"
#: js/fileactions.js:117 templates/index.php:64
msgid "Unshare"
-msgstr "Ez partekatu"
+msgstr "Ez elkarbanatu"
#: js/fileactions.js:119 templates/index.php:66
msgid "Delete"
@@ -67,7 +67,7 @@ msgstr "Berrizendatu"
#: js/filelist.js:201 js/filelist.js:203
msgid "{new_name} already exists"
-msgstr ""
+msgstr "{new_name} dagoeneko existitzen da"
#: js/filelist.js:201 js/filelist.js:203
msgid "replace"
@@ -83,7 +83,7 @@ msgstr "ezeztatu"
#: js/filelist.js:250
msgid "replaced {new_name}"
-msgstr ""
+msgstr "ordezkatua {new_name}"
#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286
msgid "undo"
@@ -91,21 +91,21 @@ msgstr "desegin"
#: js/filelist.js:252
msgid "replaced {new_name} with {old_name}"
-msgstr ""
+msgstr " {new_name}-k {old_name} ordezkatu du"
#: js/filelist.js:284
msgid "unshared {files}"
-msgstr ""
+msgstr "elkarbanaketa utzita {files}"
#: js/filelist.js:286
msgid "deleted {files}"
-msgstr ""
+msgstr "ezabatuta {files}"
#: js/files.js:33
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr ""
+msgstr "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta."
#: js/files.js:183
msgid "generating ZIP-file, it may take some time."
@@ -133,7 +133,7 @@ msgstr "fitxategi 1 igotzen"
#: js/files.js:277 js/files.js:331 js/files.js:346
msgid "{count} files uploading"
-msgstr ""
+msgstr "{count} fitxategi igotzen"
#: js/files.js:349 js/files.js:382
msgid "Upload cancelled."
@@ -146,11 +146,11 @@ msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.
#: js/files.js:523
msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
-msgstr ""
+msgstr "Karpeta izen baliogabea. \"Shared\" karpetaren erabilera Owncloudek erreserbatuta dauka"
#: js/files.js:704
msgid "{count} files scanned"
-msgstr ""
+msgstr "{count} fitxategi eskaneatuta"
#: js/files.js:712
msgid "error while scanning"
@@ -170,19 +170,19 @@ msgstr "Aldatuta"
#: js/files.js:814
msgid "1 folder"
-msgstr ""
+msgstr "karpeta bat"
#: js/files.js:816
msgid "{count} folders"
-msgstr ""
+msgstr "{count} karpeta"
#: js/files.js:824
msgid "1 file"
-msgstr ""
+msgstr "fitxategi bat"
#: js/files.js:826
msgid "{count} files"
-msgstr ""
+msgstr "{count} fitxategi"
#: templates/admin.php:5
msgid "File handling"
@@ -230,7 +230,7 @@ msgstr "Karpeta"
#: templates/index.php:11
msgid "From link"
-msgstr ""
+msgstr "Estekatik"
#: templates/index.php:22
msgid "Upload"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 1606e178d68..93adee8ec6b 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.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-11-10 00:01+0100\n"
-"PO-Revision-Date: 2012-11-09 23:01+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\n"
+"PO-Revision-Date: 2012-11-25 22:46+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -100,7 +100,7 @@ msgstr "Gehitu zure aplikazioa"
#: templates/apps.php:11
msgid "More Apps"
-msgstr ""
+msgstr "App gehiago"
#: templates/apps.php:27
msgid "Select an App"
@@ -141,7 +141,7 @@ msgstr "Erantzun"
#: templates/personal.php:8
#, php-format
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
+msgstr "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik"
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
diff --git a/l10n/eu/user_webdavauth.po b/l10n/eu/user_webdavauth.po
index a21e5c32e9c..eca9edb6ff5 100644
--- a/l10n/eu/user_webdavauth.po
+++ b/l10n/eu/user_webdavauth.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <asieriko@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-09 10:06+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\n"
+"PO-Revision-Date: 2012-11-25 22:56+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,4 +20,4 @@ msgstr ""
#: templates/settings.php:4
msgid "WebDAV URL: http://"
-msgstr ""
+msgstr "WebDAV URL: http://"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index bbe6c0ef455..28f66a6fa27 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\n"
+"PO-Revision-Date: 2012-11-25 00:59+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@ msgstr ""
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
-msgstr ""
+msgstr "Type de catégorie non spécifié."
#: ajax/vcategories/add.php:30
msgid "No category to add?"
@@ -41,18 +41,18 @@ msgstr "Cette catégorie existe déjà : "
#: ajax/vcategories/favorites.php:24
#: ajax/vcategories/removeFromFavorites.php:26
msgid "Object type not provided."
-msgstr ""
+msgstr "Type d'objet non spécifié."
#: ajax/vcategories/addToFavorites.php:30
#: ajax/vcategories/removeFromFavorites.php:30
#, php-format
msgid "%s ID not provided."
-msgstr ""
+msgstr "L'identifiant de %s n'est pas spécifié."
#: ajax/vcategories/addToFavorites.php:35
#, php-format
msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "Erreur lors de l'ajout de %s aux favoris."
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
@@ -61,61 +61,61 @@ msgstr "Aucune catégorie sélectionnée pour suppression"
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "Erreur lors de la suppression de %s des favoris."
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
msgid "Settings"
msgstr "Paramètres"
-#: js/js.js:688
+#: js/js.js:704
msgid "seconds ago"
msgstr "il y a quelques secondes"
-#: js/js.js:689
+#: js/js.js:705
msgid "1 minute ago"
msgstr "il y a une minute"
-#: js/js.js:690
+#: js/js.js:706
msgid "{minutes} minutes ago"
msgstr "il y a {minutes} minutes"
-#: js/js.js:691
+#: js/js.js:707
msgid "1 hour ago"
-msgstr ""
+msgstr "Il y a une heure"
-#: js/js.js:692
+#: js/js.js:708
msgid "{hours} hours ago"
-msgstr ""
+msgstr "Il y a {hours} heures"
-#: js/js.js:693
+#: js/js.js:709
msgid "today"
msgstr "aujourd'hui"
-#: js/js.js:694
+#: js/js.js:710
msgid "yesterday"
msgstr "hier"
-#: js/js.js:695
+#: js/js.js:711
msgid "{days} days ago"
msgstr "il y a {days} jours"
-#: js/js.js:696
+#: js/js.js:712
msgid "last month"
msgstr "le mois dernier"
-#: js/js.js:697
+#: js/js.js:713
msgid "{months} months ago"
-msgstr ""
+msgstr "Il y a {months} mois"
-#: js/js.js:698
+#: js/js.js:714
msgid "months ago"
msgstr "il y a plusieurs mois"
-#: js/js.js:699
+#: js/js.js:715
msgid "last year"
msgstr "l'année dernière"
-#: js/js.js:700
+#: js/js.js:716
msgid "years ago"
msgstr "il y a plusieurs années"
@@ -142,21 +142,21 @@ msgstr "Ok"
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
-msgstr ""
+msgstr "Le type d'objet n'est pas spécifié."
#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:527
+#: js/share.js:539
msgid "Error"
msgstr "Erreur"
#: js/oc-vcategories.js:179
msgid "The app name is not specified."
-msgstr ""
+msgstr "Le nom de l'application n'est pas spécifié."
#: js/oc-vcategories.js:194
msgid "The required file {file} is not installed!"
-msgstr ""
+msgstr "Le fichier requis {file} n'est pas installé !"
#: js/share.js:124
msgid "Error while sharing"
@@ -247,15 +247,15 @@ msgstr "supprimer"
msgid "share"
msgstr "partager"
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:343 js/share.js:514 js/share.js:516
msgid "Password protected"
msgstr "Protégé par un mot de passe"
-#: js/share.js:525
+#: js/share.js:527
msgid "Error unsetting expiration date"
msgstr "Un erreur est survenue pendant la suppression de la date d'expiration"
-#: js/share.js:537
+#: js/share.js:539
msgid "Error setting expiration date"
msgstr "Erreur lors de la spécification de la date d'expiration"
@@ -410,87 +410,87 @@ msgstr "Serveur de la base de données"
msgid "Finish setup"
msgstr "Terminer l'installation"
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
msgid "Sunday"
msgstr "Dimanche"
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
msgid "Monday"
msgstr "Lundi"
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
msgid "Tuesday"
msgstr "Mardi"
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
msgid "Wednesday"
msgstr "Mercredi"
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
msgid "Thursday"
msgstr "Jeudi"
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
msgid "Friday"
msgstr "Vendredi"
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
msgid "Saturday"
msgstr "Samedi"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "January"
msgstr "janvier"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "February"
msgstr "février"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "March"
msgstr "mars"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "April"
msgstr "avril"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "May"
msgstr "mai"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "June"
msgstr "juin"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "July"
msgstr "juillet"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "August"
msgstr "août"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "September"
msgstr "septembre"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "October"
msgstr "octobre"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "November"
msgstr "novembre"
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
msgid "December"
msgstr "décembre"
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
msgid "web services under your control"
msgstr "services web sous votre contrôle"
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
msgid "Log out"
msgstr "Se déconnecter"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 0db7fb69f6e..58459bcd524 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
-"PO-Revision-Date: 2012-11-23 23:01+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\n"
+"PO-Revision-Date: 2012-11-25 01:02+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -113,7 +113,7 @@ msgstr "Fichiers supprimés : {files}"
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr ""
+msgstr "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés."
#: js/files.js:183
msgid "generating ZIP-file, it may take some time."
@@ -154,7 +154,7 @@ msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera
#: js/files.js:523
msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
-msgstr ""
+msgstr "Nom de répertoire invalide. \"Shared\" est réservé par ownCloud"
#: js/files.js:704
msgid "{count} files scanned"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index b4788144e0d..7617ac30e7d 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\n"
+"PO-Revision-Date: 2012-11-25 00:56+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -43,19 +43,19 @@ msgstr "Applications"
msgid "Admin"
msgstr "Administration"
-#: files.php:332
+#: files.php:361
msgid "ZIP download is turned off."
msgstr "Téléchargement ZIP désactivé."
-#: files.php:333
+#: files.php:362
msgid "Files need to be downloaded one by one."
msgstr "Les fichiers nécessitent d'être téléchargés un par un."
-#: files.php:333 files.php:358
+#: files.php:362 files.php:387
msgid "Back to Files"
msgstr "Retour aux Fichiers"
-#: files.php:357
+#: files.php:386
msgid "Selected files too large to generate zip file."
msgstr "Les fichiers sélectionnés sont trop volumineux pour être compressés."
@@ -98,12 +98,12 @@ msgstr "il y a %d minutes"
#: template.php:106
msgid "1 hour ago"
-msgstr ""
+msgstr "Il y a une heure"
#: template.php:107
#, php-format
msgid "%d hours ago"
-msgstr ""
+msgstr "Il y a %d heures"
#: template.php:108
msgid "today"
@@ -125,7 +125,7 @@ msgstr "le mois dernier"
#: template.php:112
#, php-format
msgid "%d months ago"
-msgstr ""
+msgstr "Il y a %d mois"
#: template.php:113
msgid "last year"
@@ -151,4 +151,4 @@ msgstr "la vérification des mises à jour est désactivée"
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
-msgstr ""
+msgstr "Impossible de trouver la catégorie \"%s\""
diff --git a/l10n/fr/user_webdavauth.po b/l10n/fr/user_webdavauth.po
index b47a063ca39..ef3cebf7704 100644
--- a/l10n/fr/user_webdavauth.po
+++ b/l10n/fr/user_webdavauth.po
@@ -4,13 +4,14 @@
#
# Translators:
# Robert Di Rosa <>, 2012.
+# Romain DEP. <rom1dep@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-12 00:01+0100\n"
-"PO-Revision-Date: 2012-11-11 10:15+0000\n"
-"Last-Translator: Robert Di Rosa <>\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\n"
+"PO-Revision-Date: 2012-11-25 00:28+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,4 +21,4 @@ msgstr ""
#: templates/settings.php:4
msgid "WebDAV URL: http://"
-msgstr ""
+msgstr "URL WebDAV : http://"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 36379bcbeaa..6eccce4b06d 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
-"PO-Revision-Date: 2012-11-23 23:01+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-25 00:02+0100\n"
+"PO-Revision-Date: 2012-11-23 23:07+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -107,7 +107,7 @@ msgstr "eliminati {files}"
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr ""
+msgstr "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti."
#: js/files.js:183
msgid "generating ZIP-file, it may take some time."
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 0ae2725ed12..3473a57fd91 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
-"PO-Revision-Date: 2012-11-23 23:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-25 00:02+0100\n"
+"PO-Revision-Date: 2012-11-24 08:05+0000\n"
+"Last-Translator: Richard Bos <radoeka@gmail.com>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -113,7 +113,7 @@ msgstr "verwijderde {files}"
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr ""
+msgstr "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan."
#: js/files.js:183
msgid "generating ZIP-file, it may take some time."
@@ -154,7 +154,7 @@ msgstr "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de u
#: js/files.js:523
msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
-msgstr ""
+msgstr "Folder naam niet toegestaan. Het gebruik van \"Shared\" is aan Owncloud voorbehouden"
#: js/files.js:704
msgid "{count} files scanned"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index af49192a4b2..a9d8bb471e1 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
-"PO-Revision-Date: 2012-11-23 23:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-25 00:02+0100\n"
+"PO-Revision-Date: 2012-11-24 15:29+0000\n"
+"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -108,7 +108,7 @@ msgstr "{files} eliminado(s)"
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr ""
+msgstr "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos."
#: js/files.js:183
msgid "generating ZIP-file, it may take some time."
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 6965f7fe5b6..0548027dda7 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
-"PO-Revision-Date: 2012-11-23 23:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-25 00:02+0100\n"
+"PO-Revision-Date: 2012-11-24 11:33+0000\n"
+"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\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"
@@ -107,7 +107,7 @@ msgstr "izbrisano {files}"
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr ""
+msgstr "Neveljavno ime, znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni."
#: js/files.js:183
msgid "generating ZIP-file, it may take some time."
@@ -148,7 +148,7 @@ msgstr "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošilja
#: js/files.js:523
msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
-msgstr ""
+msgstr "Neveljavno ime datoteke. Uporaba mape \"Share\" je rezervirana za ownCloud."
#: js/files.js:704
msgid "{count} files scanned"
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index 4f7d243f4e1..8305b7c9cd1 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
-"PO-Revision-Date: 2012-11-23 23:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\n"
+"PO-Revision-Date: 2012-11-25 16:24+0000\n"
+"Last-Translator: suganthi <suganthi@nic.lk>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -104,7 +104,7 @@ msgstr "நீக்கப்பட்டது {கோப்புகள்}"
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr ""
+msgstr "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது."
#: js/files.js:183
msgid "generating ZIP-file, it may take some time."
@@ -145,7 +145,7 @@ msgstr "கோப்பு பதிவேற்றம் செயல்பா
#: js/files.js:523
msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
-msgstr ""
+msgstr "செல்லுபடியற்ற கோப்புறை பெயர். \"பகிர்வின்\" பாவனை Owncloud இனால் ஒதுக்கப்பட்டுள்ளது"
#: js/files.js:704
msgid "{count} files scanned"
diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po
index 469c1e516eb..8bbabf7c153 100644
--- a/l10n/ta_LK/files_external.po
+++ b/l10n/ta_LK/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <suganthi@nic.lk>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:03+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\n"
+"PO-Revision-Date: 2012-11-25 17:04+0000\n"
+"Last-Translator: suganthi <suganthi@nic.lk>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,88 +20,88 @@ msgstr ""
#: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23
msgid "Access granted"
-msgstr ""
+msgstr "அனுமதி வழங்கப்பட்டது"
#: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86
msgid "Error configuring Dropbox storage"
-msgstr ""
+msgstr "Dropbox சேமிப்பை தகவமைப்பதில் வழு"
#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40
msgid "Grant access"
-msgstr ""
+msgstr "அனுமதியை வழங்கல்"
#: js/dropbox.js:73 js/google.js:72
msgid "Fill out all required fields"
-msgstr ""
+msgstr "தேவையான எல்லா புலங்களையும் நிரப்புக"
#: js/dropbox.js:85
msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
+msgstr "தயவுசெய்து ஒரு செல்லுபடியான Dropbox செயலி சாவி மற்றும் இரகசியத்தை வழங்குக. "
#: js/google.js:26 js/google.js:73 js/google.js:78
msgid "Error configuring Google Drive storage"
-msgstr ""
+msgstr "Google இயக்க சேமிப்பகத்தை தகமைப்பதில் வழு"
#: templates/settings.php:3
msgid "External Storage"
-msgstr ""
+msgstr "வெளி சேமிப்பு"
#: templates/settings.php:7 templates/settings.php:19
msgid "Mount point"
-msgstr ""
+msgstr "ஏற்றப்புள்ளி"
#: templates/settings.php:8
msgid "Backend"
-msgstr ""
+msgstr "பின்நிலை"
#: templates/settings.php:9
msgid "Configuration"
-msgstr ""
+msgstr "தகவமைப்பு"
#: templates/settings.php:10
msgid "Options"
-msgstr ""
+msgstr "தெரிவுகள்"
#: templates/settings.php:11
msgid "Applicable"
-msgstr ""
+msgstr "பயன்படத்தக்க"
#: templates/settings.php:23
msgid "Add mount point"
-msgstr ""
+msgstr "ஏற்றப்புள்ளியை சேர்க்க"
#: templates/settings.php:54 templates/settings.php:62
msgid "None set"
-msgstr ""
+msgstr "தொகுப்பில்லா"
#: templates/settings.php:63
msgid "All Users"
-msgstr ""
+msgstr "பயனாளர்கள் எல்லாம்"
#: templates/settings.php:64
msgid "Groups"
-msgstr ""
+msgstr "குழுக்கள்"
#: templates/settings.php:69
msgid "Users"
-msgstr ""
+msgstr "பயனாளர்"
#: templates/settings.php:77 templates/settings.php:107
msgid "Delete"
-msgstr ""
+msgstr "நீக்குக"
#: templates/settings.php:87
msgid "Enable User External Storage"
-msgstr ""
+msgstr "பயனாளர் வெளி சேமிப்பை இயலுமைப்படுத்துக"
#: templates/settings.php:88
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "பயனாளர் அவர்களுடைய சொந்த வெளியக சேமிப்பை ஏற்ற அனுமதிக்க"
#: templates/settings.php:99
msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL வேர் சான்றிதழ்கள்"
#: templates/settings.php:113
msgid "Import Root Certificate"
-msgstr ""
+msgstr "வேர் சான்றிதழை இறக்குமதி செய்க"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 56d454f990a..b09dccc2a73 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\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 3d1b04ec5c3..423f7f42737 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\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 f8e2747aefe..55cd072fc3b 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\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 522cf83723c..a08e7852bcf 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\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 c5b079fd8ef..f1a671c7ee4 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\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 37ea370e042..e2a5cec27b2 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\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 0745f27520e..66bfa23b0cc 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\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/settings.pot b/l10n/templates/settings.pot
index 91af1ab43bd..20ea64dcbed 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\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 bf39bb3089c..40a4786ac12 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\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 c0d3a4fd82d..3740c1853c5 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
+"POT-Creation-Date: 2012-11-26 00:01+0100\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/zh_CN/files.po b/l10n/zh_CN/files.po
index 2cfc6233100..e55a10f86ee 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -4,6 +4,7 @@
#
# Translators:
# <appweb.cn@gmail.com>, 2012.
+# Dianjin Wang <1132321739qq@gmail.com>, 2012.
# <rainofchaos@gmail.com>, 2012.
# <suiy02@gmail.com>, 2012.
# <wengxt@gmail.com>, 2011, 2012.
@@ -11,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
-"PO-Revision-Date: 2012-11-23 23:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-25 00:02+0100\n"
+"PO-Revision-Date: 2012-11-24 10:07+0000\n"
+"Last-Translator: Dianjin Wang <1132321739qq@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -107,7 +108,7 @@ msgstr "删除了 {files}"
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr ""
+msgstr "无效名称,'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。"
#: js/files.js:183
msgid "generating ZIP-file, it may take some time."
@@ -148,7 +149,7 @@ msgstr "文件正在上传中。现在离开此页会导致上传动作被取消
#: js/files.js:523
msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
-msgstr ""
+msgstr "无效的文件夹名称。”Shared“ 是 Owncloud 保留字符。"
#: js/files.js:704
msgid "{count} files scanned"
diff --git a/lib/db.php b/lib/db.php
index f79768a6640..e63a7a20c81 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -353,12 +353,19 @@ class OC_DB {
*/
public static function insertid($table=null) {
self::connect();
- if($table !== null) {
- $prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
- $suffix = OC_Config::getValue( "dbsequencesuffix", "_id_seq" );
- $table = str_replace( '*PREFIX*', $prefix, $table ).$suffix;
+ $type = OC_Config::getValue( "dbtype", "sqlite" );
+ if( $type == 'pgsql' ) {
+ $query = self::prepare('SELECT lastval() AS id');
+ $row = $query->execute()->fetchRow();
+ return $row['id'];
+ }else{
+ if($table !== null) {
+ $prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
+ $suffix = OC_Config::getValue( "dbsequencesuffix", "_id_seq" );
+ $table = str_replace( '*PREFIX*', $prefix, $table ).$suffix;
+ }
+ return self::$connection->lastInsertId($table);
}
- return self::$connection->lastInsertId($table);
}
/**
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index ad5a034f5b6..218c22c1d53 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -18,13 +18,17 @@
"seconds ago" => "à l'instant",
"1 minute ago" => "il y a 1 minute",
"%d minutes ago" => "il y a %d minutes",
+"1 hour ago" => "Il y a une heure",
+"%d hours ago" => "Il y a %d heures",
"today" => "aujourd'hui",
"yesterday" => "hier",
"%d days ago" => "il y a %d jours",
"last month" => "le mois dernier",
+"%d months ago" => "Il y a %d mois",
"last year" => "l'année dernière",
"years ago" => "il y a plusieurs années",
"%s is available. Get <a href=\"%s\">more information</a>" => "%s est disponible. Obtenez <a href=\"%s\">plus d'informations</a>",
"up to date" => "À jour",
-"updates check is disabled" => "la vérification des mises à jour est désactivée"
+"updates check is disabled" => "la vérification des mises à jour est désactivée",
+"Could not find category \"%s\"" => "Impossible de trouver la catégorie \"%s\""
);
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index bfef1a0447d..d6c87e0928b 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -18,6 +18,7 @@
"Saving..." => "Gordetzen...",
"__language_name__" => "Euskera",
"Add your App" => "Gehitu zure aplikazioa",
+"More Apps" => "App gehiago",
"Select an App" => "Aukeratu programa bat",
"See application page at apps.owncloud.com" => "Ikusi programen orria apps.owncloud.com en",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizentziatua <span class=\"author\"></span>",
@@ -27,6 +28,7 @@
"Problems connecting to help database." => "Arazoak daude laguntza datubasera konektatzeko.",
"Go there manually." => "Joan hara eskuz.",
"Answer" => "Erantzun",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik",
"Desktop and Mobile Syncing Clients" => "Mahaigain eta mugikorren sinkronizazio bezeroak",
"Download" => "Deskargatu",
"Your password was changed" => "Zere pasahitza aldatu da",