From 9ab887fed543a22f8a57e3322eb4ff23834e2f86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 26 Sep 2012 21:35:14 +0200 Subject: [PATCH 01/42] fix security issue, don't allow to go back in the path --- apps/files_external/ajax/removeRootCertificate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_external/ajax/removeRootCertificate.php b/apps/files_external/ajax/removeRootCertificate.php index 9b78e180d9e..f87d4a56308 100644 --- a/apps/files_external/ajax/removeRootCertificate.php +++ b/apps/files_external/ajax/removeRootCertificate.php @@ -5,7 +5,7 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); $view = \OCP\Files::getStorage("files_external"); -$cert = $_POST['cert']; +$cert = ltrim($_POST['cert'], "/."); $file = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("").'uploads/'.$cert; unlink($file); OC_Mount_Config::createCertificateBundle(); From 21c6cc45e610f47f7bb7a77132a8f2effd5a83f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 26 Sep 2012 23:08:40 +0200 Subject: [PATCH 02/42] take '\' on windows systems into account to prevent file deletion above upload direectory --- apps/files_external/ajax/removeRootCertificate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_external/ajax/removeRootCertificate.php b/apps/files_external/ajax/removeRootCertificate.php index f87d4a56308..8c196eddf55 100644 --- a/apps/files_external/ajax/removeRootCertificate.php +++ b/apps/files_external/ajax/removeRootCertificate.php @@ -5,7 +5,7 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); $view = \OCP\Files::getStorage("files_external"); -$cert = ltrim($_POST['cert'], "/."); +$cert = ltrim($_POST['cert'], "/\\."); $file = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("").'uploads/'.$cert; unlink($file); OC_Mount_Config::createCertificateBundle(); From 09aa95586ab1c913a5736af88eb7916d762328e8 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Thu, 27 Sep 2012 02:03:09 +0200 Subject: [PATCH 03/42] [tx-robot] updated from transifex --- apps/files/l10n/cs_CZ.php | 12 +++++ apps/files/l10n/de.php | 12 +++++ apps/files/l10n/fi_FI.php | 10 ++++ apps/files/l10n/fr.php | 12 +++++ apps/files/l10n/it.php | 12 +++++ apps/files/l10n/pt_BR.php | 12 +++++ apps/files/l10n/ro.php | 13 +++++ apps/files/l10n/sv.php | 12 +++++ apps/files/l10n/th_TH.php | 12 +++++ apps/files_encryption/l10n/pt_PT.php | 6 +++ apps/files_external/l10n/pt_PT.php | 10 ++++ apps/files_sharing/l10n/fi_FI.php | 2 + apps/files_sharing/l10n/ro.php | 2 + apps/files_versions/l10n/fi_FI.php | 1 + apps/files_versions/l10n/pt_PT.php | 7 +++ apps/files_versions/l10n/ro.php | 1 + core/l10n/cs_CZ.php | 1 + core/l10n/de.php | 1 + core/l10n/fr.php | 1 + core/l10n/it.php | 1 + core/l10n/pt_BR.php | 1 + core/l10n/ro.php | 25 +++++++++ core/l10n/sv.php | 1 + core/l10n/th_TH.php | 1 + l10n/cs_CZ/core.po | 8 +-- l10n/cs_CZ/files.po | 74 +++++++++++++-------------- l10n/de/core.po | 6 +-- l10n/de/files.po | 74 +++++++++++++-------------- l10n/fi_FI/files.po | 70 ++++++++++++------------- l10n/fi_FI/files_sharing.po | 10 ++-- l10n/fi_FI/files_versions.po | 8 +-- l10n/fr/core.po | 9 ++-- l10n/fr/files.po | 75 +++++++++++++-------------- l10n/it/core.po | 8 +-- l10n/it/files.po | 74 +++++++++++++-------------- l10n/pt_BR/core.po | 8 +-- l10n/pt_BR/files.po | 74 +++++++++++++-------------- l10n/pt_PT/files_encryption.po | 17 ++++--- l10n/pt_PT/files_external.po | 45 ++++++++-------- l10n/pt_PT/files_versions.po | 17 ++++--- l10n/ro/core.po | 56 ++++++++++---------- l10n/ro/files.po | 76 ++++++++++++++-------------- l10n/ro/files_sharing.po | 10 ++-- l10n/ro/files_versions.po | 8 +-- l10n/sv/core.po | 8 +-- l10n/sv/files.po | 74 +++++++++++++-------------- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 40 +++++++-------- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/th_TH/core.po | 8 +-- l10n/th_TH/files.po | 74 +++++++++++++-------------- 57 files changed, 644 insertions(+), 471 deletions(-) create mode 100644 apps/files_encryption/l10n/pt_PT.php create mode 100644 apps/files_external/l10n/pt_PT.php create mode 100644 apps/files_versions/l10n/pt_PT.php diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php index 1ade9e618c4..04db7316f90 100644 --- a/apps/files/l10n/cs_CZ.php +++ b/apps/files/l10n/cs_CZ.php @@ -23,6 +23,8 @@ "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í", "Pending" => "Čekající", +"1 file uploading" => "odesílá se 1 soubor", +"files uploading" => "souborů se odesílá", "Upload cancelled." => "Odesílání zrušeno.", "File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky vyústí ve zrušení nahrávání.", "Invalid name, '/' is not allowed." => "Neplatný název, znak '/' není povolen", @@ -35,6 +37,16 @@ "folders" => "složky", "file" => "soubor", "files" => "soubory", +"seconds ago" => "před pár sekundami", +"minute ago" => "před minutou", +"minutes ago" => "před pár minutami", +"today" => "dnes", +"yesterday" => "včera", +"days ago" => "před pár dny", +"last month" => "minulý měsíc", +"months ago" => "před pár měsíci", +"last year" => "minulý rok", +"years ago" => "před pár lety", "File handling" => "Zacházení se soubory", "Maximum upload size" => "Maximální velikost pro odesílání", "max. possible: " => "největší možná: ", diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php index 8b3f2857298..ef2cd8b673a 100644 --- a/apps/files/l10n/de.php +++ b/apps/files/l10n/de.php @@ -23,6 +23,8 @@ "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 ist oder 0 Bytes hat.", "Upload Error" => "Fehler beim Hochladen", "Pending" => "Ausstehend", +"1 file uploading" => "Eine Datei wird hoch geladen", +"files uploading" => "Dateien werden hoch geladen", "Upload cancelled." => "Hochladen abgebrochen.", "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.", "Invalid name, '/' is not allowed." => "Ungültiger Name: \"/\" ist nicht erlaubt.", @@ -35,6 +37,16 @@ "folders" => "Ordner", "file" => "Datei", "files" => "Dateien", +"seconds ago" => "Sekunden her", +"minute ago" => "Minute her", +"minutes ago" => "Minuten her", +"today" => "Heute", +"yesterday" => "Gestern", +"days ago" => "Tage her", +"last month" => "Letzten Monat", +"months ago" => "Monate her", +"last year" => "Letztes Jahr", +"years ago" => "Jahre her", "File handling" => "Dateibehandlung", "Maximum upload size" => "Maximale Upload-Größe", "max. possible: " => "maximal möglich:", diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php index 1b9cee5ebb3..8e874ad4d95 100644 --- a/apps/files/l10n/fi_FI.php +++ b/apps/files/l10n/fi_FI.php @@ -31,6 +31,16 @@ "folders" => "kansiota", "file" => "tiedosto", "files" => "tiedostoa", +"seconds ago" => "sekuntia sitten", +"minute ago" => "minuutti sitten", +"minutes ago" => "minuuttia sitten", +"today" => "tänään", +"yesterday" => "eilen", +"days ago" => "päivää sitten", +"last month" => "viime kuussa", +"months ago" => "kuukautta sitten", +"last year" => "viime vuonna", +"years ago" => "vuotta sitten", "File handling" => "Tiedostonhallinta", "Maximum upload size" => "Lähetettävän tiedoston suurin sallittu koko", "max. possible: " => "suurin mahdollinen:", diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php index 0e874bcf354..f58bfa5cc5e 100644 --- a/apps/files/l10n/fr.php +++ b/apps/files/l10n/fr.php @@ -23,6 +23,8 @@ "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", "Pending" => "En cours", +"1 file uploading" => "1 fichier en cours de téléchargement", +"files uploading" => "fichiers en cours de téléchargement", "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 name, '/' is not allowed." => "Nom invalide, '/' n'est pas autorisé.", @@ -35,6 +37,16 @@ "folders" => "dossiers", "file" => "fichier", "files" => "fichiers", +"seconds ago" => "secondes passées", +"minute ago" => "minute passée", +"minutes ago" => "minutes passées", +"today" => "aujourd'hui", +"yesterday" => "hier", +"days ago" => "jours passés", +"last month" => "mois dernier", +"months ago" => "mois passés", +"last year" => "année dernière", +"years ago" => "années passées", "File handling" => "Gestion des fichiers", "Maximum upload size" => "Taille max. d'envoi", "max. possible: " => "Max. possible :", diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php index 4cb2daf6971..86f2ff84fcf 100644 --- a/apps/files/l10n/it.php +++ b/apps/files/l10n/it.php @@ -23,6 +23,8 @@ "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", "Pending" => "In corso", +"1 file uploading" => "1 file in fase di caricamento", +"files uploading" => "file in fase di caricamento", "Upload cancelled." => "Invio annullato", "File upload is in progress. Leaving the page now will cancel the upload." => "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.", "Invalid name, '/' is not allowed." => "Nome non valido", @@ -35,6 +37,16 @@ "folders" => "cartelle", "file" => "file", "files" => "file", +"seconds ago" => "secondi fa", +"minute ago" => "minuto fa", +"minutes ago" => "minuti fa", +"today" => "oggi", +"yesterday" => "ieri", +"days ago" => "giorni fa", +"last month" => "mese scorso", +"months ago" => "mesi fa", +"last year" => "anno scorso", +"years ago" => "anni fa", "File handling" => "Gestione file", "Maximum upload size" => "Dimensione massima upload", "max. possible: " => "numero mass.: ", diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php index d9e6e3290ed..59ec8a8a018 100644 --- a/apps/files/l10n/pt_BR.php +++ b/apps/files/l10n/pt_BR.php @@ -23,6 +23,8 @@ "Unable to upload your file as it is a directory or has 0 bytes" => "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes.", "Upload Error" => "Erro de envio", "Pending" => "Pendente", +"1 file uploading" => "enviando 1 arquivo", +"files uploading" => "enviando arquivos", "Upload cancelled." => "Envio cancelado.", "File upload is in progress. Leaving the page now will cancel the upload." => "Upload em andamento. Sair da página agora resultará no cancelamento do envio.", "Invalid name, '/' is not allowed." => "Nome inválido, '/' não é permitido.", @@ -35,6 +37,16 @@ "folders" => "pastas", "file" => "arquivo", "files" => "arquivos", +"seconds ago" => "segundos atrás", +"minute ago" => "minuto atrás", +"minutes ago" => "minutos atrás", +"today" => "hoje", +"yesterday" => "ontem", +"days ago" => "dias atrás", +"last month" => "último mês", +"months ago" => "meses atrás", +"last year" => "último ano", +"years ago" => "anos atrás", "File handling" => "Tratamento de Arquivo", "Maximum upload size" => "Tamanho máximo para carregar", "max. possible: " => "max. possível:", diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php index ff4a8119372..8d651e23827 100644 --- a/apps/files/l10n/ro.php +++ b/apps/files/l10n/ro.php @@ -9,6 +9,7 @@ "Files" => "Fișiere", "Unshare" => "Anulează partajarea", "Delete" => "Șterge", +"Rename" => "Redenumire", "already exists" => "deja există", "replace" => "înlocuire", "suggest name" => "sugerează nume", @@ -22,6 +23,8 @@ "Unable to upload your file as it is a directory or has 0 bytes" => "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes.", "Upload Error" => "Eroare la încărcare", "Pending" => "În așteptare", +"1 file uploading" => "un fișier se încarcă", +"files uploading" => "fișiere se încarcă", "Upload cancelled." => "Încărcare anulată.", "File upload is in progress. Leaving the page now will cancel the upload." => "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.", "Invalid name, '/' is not allowed." => "Nume invalid, '/' nu este permis.", @@ -34,6 +37,16 @@ "folders" => "directoare", "file" => "fișier", "files" => "fișiere", +"seconds ago" => "secunde în urmă", +"minute ago" => "minut în urmă", +"minutes ago" => "minute în urmă", +"today" => "astăzi", +"yesterday" => "ieri", +"days ago" => "zile în urmă", +"last month" => "ultima lună", +"months ago" => "luni în urmă", +"last year" => "ultimul an", +"years ago" => "ani în urmă", "File handling" => "Manipulare fișiere", "Maximum upload size" => "Dimensiune maximă admisă la încărcare", "max. possible: " => "max. posibil:", diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php index e94390fc774..d5dcf1ad2e8 100644 --- a/apps/files/l10n/sv.php +++ b/apps/files/l10n/sv.php @@ -23,6 +23,8 @@ "Unable to upload your file as it is a directory or has 0 bytes" => "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes.", "Upload Error" => "Uppladdningsfel", "Pending" => "Väntar", +"1 file uploading" => "1 filuppladdning", +"files uploading" => "filer laddas upp", "Upload cancelled." => "Uppladdning avbruten.", "File upload is in progress. Leaving the page now will cancel the upload." => "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.", "Invalid name, '/' is not allowed." => "Ogiltigt namn, '/' är inte tillåten.", @@ -35,6 +37,16 @@ "folders" => "mappar", "file" => "fil", "files" => "filer", +"seconds ago" => "sekunder sedan", +"minute ago" => "minut sedan", +"minutes ago" => "minuter sedan", +"today" => "i dag", +"yesterday" => "i går", +"days ago" => "dagar sedan", +"last month" => "förra månaden", +"months ago" => "månader sedan", +"last year" => "förra året", +"years ago" => "år sedan", "File handling" => "Filhantering", "Maximum upload size" => "Maximal storlek att ladda upp", "max. possible: " => "max. möjligt:", diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php index db037b06c26..dc94ddc7de5 100644 --- a/apps/files/l10n/th_TH.php +++ b/apps/files/l10n/th_TH.php @@ -23,6 +23,8 @@ "Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์", "Upload Error" => "เกิดข้อผิดพลาดในการอัพโหลด", "Pending" => "อยู่ระหว่างดำเนินการ", +"1 file uploading" => "กำลังอัพโหลดไฟล์ 1 ไฟล์", +"files uploading" => "การอัพโหลดไฟล์", "Upload cancelled." => "การอัพโหลดถูกยกเลิก", "File upload is in progress. Leaving the page now will cancel the upload." => "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก", "Invalid name, '/' is not allowed." => "ชื่อที่ใช้ไม่ถูกต้อง '/' ไม่อนุญาตให้ใช้งาน", @@ -35,6 +37,16 @@ "folders" => "โฟลเดอร์", "file" => "ไฟล์", "files" => "ไฟล์", +"seconds ago" => "วินาที ก่อนหน้านี้", +"minute ago" => "นาที ที่ผ่านมา", +"minutes ago" => "นาที ที่ผ่านมา", +"today" => "วันนี้", +"yesterday" => "เมื่อวานนี้", +"days ago" => "วัน ที่ผ่านมา", +"last month" => "เดือนที่แล้ว", +"months ago" => "เดือน ที่ผ่านมา", +"last year" => "ปีที่แล้ว", +"years ago" => "ปี ที่ผ่านมา", "File handling" => "การจัดกาไฟล์", "Maximum upload size" => "ขนาดไฟล์สูงสุดที่อัพโหลดได้", "max. possible: " => "จำนวนสูงสุดที่สามารถทำได้: ", diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php new file mode 100644 index 00000000000..570462b414f --- /dev/null +++ b/apps/files_encryption/l10n/pt_PT.php @@ -0,0 +1,6 @@ + "Encriptação", +"Exclude the following file types from encryption" => "Excluir da encriptação os seguintes tipo de ficheiros", +"None" => "Nenhum", +"Enable Encryption" => "Activar Encriptação" +); diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php new file mode 100644 index 00000000000..8b4680b3711 --- /dev/null +++ b/apps/files_external/l10n/pt_PT.php @@ -0,0 +1,10 @@ + "Configuração", +"Options" => "Opções", +"Applicable" => "Aplicável", +"All Users" => "Todos os utilizadores", +"Groups" => "Grupos", +"Users" => "Utilizadores", +"Delete" => "Apagar", +"Import Root Certificate" => "Importar Certificado Root" +); diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php index 85c6c7a7132..6c441342133 100644 --- a/apps/files_sharing/l10n/fi_FI.php +++ b/apps/files_sharing/l10n/fi_FI.php @@ -1,6 +1,8 @@ "Salasana", "Submit" => "Lähetä", +"%s shared the folder %s with you" => "%s jakoi kansion %s kanssasi", +"%s shared the file %s with you" => "%s jakoi tiedoston %s kanssasi", "Download" => "Lataa", "No preview available for" => "Ei esikatselua kohteelle", "web services under your control" => "verkkopalvelut hallinnassasi" diff --git a/apps/files_sharing/l10n/ro.php b/apps/files_sharing/l10n/ro.php index 4943fcc03c7..eb9977dc585 100644 --- a/apps/files_sharing/l10n/ro.php +++ b/apps/files_sharing/l10n/ro.php @@ -1,6 +1,8 @@ "Parolă", "Submit" => "Trimite", +"%s shared the folder %s with you" => "%s a partajat directorul %s cu tine", +"%s shared the file %s with you" => "%s a partajat fișierul %s cu tine", "Download" => "Descarcă", "No preview available for" => "Nici o previzualizare disponibilă pentru ", "web services under your control" => "servicii web controlate de tine" diff --git a/apps/files_versions/l10n/fi_FI.php b/apps/files_versions/l10n/fi_FI.php index 7e0894b3f18..3cec4c04bfe 100644 --- a/apps/files_versions/l10n/fi_FI.php +++ b/apps/files_versions/l10n/fi_FI.php @@ -1,5 +1,6 @@ "Vanhenna kaikki versiot", +"History" => "Historia", "Versions" => "Versiot", "This will delete all existing backup versions of your files" => "Tämä poistaa kaikki tiedostojesi olemassa olevat varmuuskopioversiot", "Files Versioning" => "Tiedostojen versiointi", diff --git a/apps/files_versions/l10n/pt_PT.php b/apps/files_versions/l10n/pt_PT.php new file mode 100644 index 00000000000..eb80eec6ed8 --- /dev/null +++ b/apps/files_versions/l10n/pt_PT.php @@ -0,0 +1,7 @@ + "Expirar todas as versões", +"History" => "Histórico", +"Versions" => "Versões", +"This will delete all existing backup versions of your files" => "Isto irá apagar todas as versões de backup do seus ficheiros", +"Enable" => "Activar" +); diff --git a/apps/files_versions/l10n/ro.php b/apps/files_versions/l10n/ro.php index 597be7330c5..e23e771e392 100644 --- a/apps/files_versions/l10n/ro.php +++ b/apps/files_versions/l10n/ro.php @@ -1,5 +1,6 @@ "Expiră toate versiunile", +"History" => "Istoric", "Versions" => "Versiuni", "This will delete all existing backup versions of your files" => "Această acțiune va șterge toate versiunile salvate ale fișierelor tale", "Files Versioning" => "Versionare fișiere", diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php index 69fdc06a293..790ab423e38 100644 --- a/core/l10n/cs_CZ.php +++ b/core/l10n/cs_CZ.php @@ -45,6 +45,7 @@ "delete" => "smazat", "share" => "sdílet", "Password protected" => "Chráněno heslem", +"Error unsetting expiration date" => "Chyba při odstraňování data vypršení platnosti", "Error setting expiration date" => "Chyba při nastavení data vypršení platnosti", "ownCloud password reset" => "Obnovení hesla pro ownCloud", "Use the following link to reset your password: {link}" => "Heslo obnovíte použitím následujícího odkazu: {link}", diff --git a/core/l10n/de.php b/core/l10n/de.php index 0a87fc4e8e7..d252700df16 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -45,6 +45,7 @@ "delete" => "löschen", "share" => "teilen", "Password protected" => "Passwort geschützt", +"Error unsetting expiration date" => "Fehler beim entfernen des Ablaufdatums", "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums", "ownCloud password reset" => "ownCloud-Passwort zurücksetzen", "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}", diff --git a/core/l10n/fr.php b/core/l10n/fr.php index d6fbb7693df..1a2d17c69d0 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -45,6 +45,7 @@ "delete" => "supprimer", "share" => "partager", "Password protected" => "Protégé par un mot de passe", +"Error unsetting expiration date" => "Un erreur est survenue pendant la suppression de la date d'expiration", "Error setting expiration date" => "Erreur lors de la spécification de la date d'expiration", "ownCloud password reset" => "Réinitialisation de votre mot de passe Owncloud", "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}", diff --git a/core/l10n/it.php b/core/l10n/it.php index cce4ac44cdc..669c6b6e44a 100644 --- a/core/l10n/it.php +++ b/core/l10n/it.php @@ -45,6 +45,7 @@ "delete" => "eliminare", "share" => "condividere", "Password protected" => "Protetta da password", +"Error unsetting expiration date" => "Errore durante la rimozione della data di scadenza", "Error setting expiration date" => "Errore durante l'impostazione della data di scadenza", "ownCloud password reset" => "Ripristino password di ownCloud", "Use the following link to reset your password: {link}" => "Usa il collegamento seguente per ripristinare la password: {link}", diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php index 21ae28be1e7..cd7064e89c3 100644 --- a/core/l10n/pt_BR.php +++ b/core/l10n/pt_BR.php @@ -45,6 +45,7 @@ "delete" => "remover", "share" => "compartilhar", "Password protected" => "Protegido com senha", +"Error unsetting expiration date" => "Erro ao remover data de expiração", "Error setting expiration date" => "Erro ao definir data de expiração", "ownCloud password reset" => "Redefinir senha ownCloud", "Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {link}", diff --git a/core/l10n/ro.php b/core/l10n/ro.php index 8647cc11901..4083113a653 100644 --- a/core/l10n/ro.php +++ b/core/l10n/ro.php @@ -15,13 +15,38 @@ "October" => "Octombrie", "November" => "Noiembrie", "December" => "Decembrie", +"Choose" => "Alege", "Cancel" => "Anulare", "No" => "Nu", "Yes" => "Da", "Ok" => "Ok", "No categories selected for deletion." => "Nici o categorie selectată pentru ștergere.", "Error" => "Eroare", +"Error while sharing" => "Eroare la partajare", +"Error while unsharing" => "Eroare la anularea partajării", +"Error while changing permissions" => "Eroare la modificarea permisiunilor", +"Shared with you and the group %s by %s" => "Partajat cu tine și grupul %s de %s", +"Shared with you by %s" => "Partajat cu tine de %s", +"Share with" => "Partajat cu", +"Share with link" => "Partajare cu legătură", +"Password protect" => "Protejare cu parolă", "Password" => "Parola", +"Set expiration date" => "Specifică data expirării", +"Expiration date" => "Data expirării", +"Share via email: %s" => "Partajare prin email: %s", +"No people found" => "Nici o persoană găsită", +"Resharing is not allowed" => "Repartajarea nu este permisă", +"Shared in %s with %s" => "Partajat în %s cu %s", +"Unshare" => "Anulare partajare", +"can edit" => "poate edita", +"access control" => "control acces", +"create" => "creare", +"update" => "actualizare", +"delete" => "ștergere", +"share" => "partajare", +"Password protected" => "Protejare cu parolă", +"Error unsetting expiration date" => "Eroare la anularea datei de expirare", +"Error setting expiration date" => "Eroare la specificarea datei de expirare", "ownCloud password reset" => "Resetarea parolei ownCloud ", "Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}", "You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email", diff --git a/core/l10n/sv.php b/core/l10n/sv.php index 2669d4d5b32..993aae71ac3 100644 --- a/core/l10n/sv.php +++ b/core/l10n/sv.php @@ -45,6 +45,7 @@ "delete" => "radera", "share" => "dela", "Password protected" => "Lösenordsskyddad", +"Error unsetting expiration date" => "Fel vid borttagning av utgångsdatum", "Error setting expiration date" => "Fel vid sättning av utgångsdatum", "ownCloud password reset" => "ownCloud lösenordsåterställning", "Use the following link to reset your password: {link}" => "Använd följande länk för att återställa lösenordet: {link}", diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php index ce8b97ae529..65b14b121d5 100644 --- a/core/l10n/th_TH.php +++ b/core/l10n/th_TH.php @@ -45,6 +45,7 @@ "delete" => "ลบ", "share" => "แชร์", "Password protected" => "ใส่รหัสผ่านไว้", +"Error unsetting expiration date" => "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ", "Error setting expiration date" => "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ", "ownCloud password reset" => "รีเซ็ตรหัสผ่าน ownCloud", "Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}", diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po index 185d23e60e2..4ae1820806a 100644 --- a/l10n/cs_CZ/core.po +++ b/l10n/cs_CZ/core.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-09-26 13:19+0200\n" -"PO-Revision-Date: 2012-09-26 11:19+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 11:43+0000\n" +"Last-Translator: Tomáš Chvátal \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" @@ -212,7 +212,7 @@ msgstr "Chráněno heslem" #: js/share.js:489 msgid "Error unsetting expiration date" -msgstr "" +msgstr "Chyba při odstraňování data vypršení platnosti" #: js/share.js:501 msgid "Error setting expiration date" diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po index 96ed0e4f7fd..423a5045da8 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-09-26 13:19+0200\n" -"PO-Revision-Date: 2012-09-26 11:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 12:01+0000\n" +"Last-Translator: Tomáš Chvátal \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" @@ -120,11 +120,11 @@ msgstr "Čekající" #: js/files.js:256 msgid "1 file uploading" -msgstr "" +msgstr "odesílá se 1 soubor" #: js/files.js:259 js/files.js:304 js/files.js:319 msgid "files uploading" -msgstr "" +msgstr "souborů se odesílá" #: js/files.js:322 js/files.js:355 msgid "Upload cancelled." @@ -139,81 +139,81 @@ msgstr "Probíhá odesílání souboru. Opuštění stránky vyústí ve zrušen msgid "Invalid name, '/' is not allowed." msgstr "Neplatný název, znak '/' není povolen" -#: js/files.js:667 +#: js/files.js:668 msgid "files scanned" msgstr "soubory prohledány" -#: js/files.js:675 +#: js/files.js:676 msgid "error while scanning" msgstr "chyba při prohledávání" -#: js/files.js:748 templates/index.php:48 +#: js/files.js:749 templates/index.php:48 msgid "Name" msgstr "Název" -#: js/files.js:749 templates/index.php:56 +#: js/files.js:750 templates/index.php:56 msgid "Size" msgstr "Velikost" -#: js/files.js:750 templates/index.php:58 +#: js/files.js:751 templates/index.php:58 msgid "Modified" msgstr "Změněno" -#: js/files.js:777 +#: js/files.js:778 msgid "folder" msgstr "složka" -#: js/files.js:779 +#: js/files.js:780 msgid "folders" msgstr "složky" -#: js/files.js:787 +#: js/files.js:788 msgid "file" msgstr "soubor" -#: js/files.js:789 +#: js/files.js:790 msgid "files" msgstr "soubory" -#: js/files.js:833 -msgid "seconds ago" -msgstr "" - #: js/files.js:834 -msgid "minute ago" -msgstr "" +msgid "seconds ago" +msgstr "před pár sekundami" #: js/files.js:835 -msgid "minutes ago" -msgstr "" +msgid "minute ago" +msgstr "před minutou" -#: js/files.js:838 -msgid "today" -msgstr "" +#: js/files.js:836 +msgid "minutes ago" +msgstr "před pár minutami" #: js/files.js:839 -msgid "yesterday" -msgstr "" +msgid "today" +msgstr "dnes" #: js/files.js:840 -msgid "days ago" -msgstr "" +msgid "yesterday" +msgstr "včera" #: js/files.js:841 -msgid "last month" -msgstr "" +msgid "days ago" +msgstr "před pár dny" -#: js/files.js:843 -msgid "months ago" -msgstr "" +#: js/files.js:842 +msgid "last month" +msgstr "minulý měsíc" #: js/files.js:844 -msgid "last year" -msgstr "" +msgid "months ago" +msgstr "před pár měsíci" #: js/files.js:845 +msgid "last year" +msgstr "minulý rok" + +#: js/files.js:846 msgid "years ago" -msgstr "" +msgstr "před pár lety" #: templates/admin.php:5 msgid "File handling" diff --git a/l10n/de/core.po b/l10n/de/core.po index e6d69f6e985..7e0a3635c55 100644 --- a/l10n/de/core.po +++ b/l10n/de/core.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-26 13:19+0200\n" -"PO-Revision-Date: 2012-09-26 11:19+0000\n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 11:39+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" @@ -221,7 +221,7 @@ msgstr "Passwort geschützt" #: js/share.js:489 msgid "Error unsetting expiration date" -msgstr "" +msgstr "Fehler beim entfernen des Ablaufdatums" #: js/share.js:501 msgid "Error setting expiration date" diff --git a/l10n/de/files.po b/l10n/de/files.po index 52b85e608db..111dacc2d9f 100644 --- a/l10n/de/files.po +++ b/l10n/de/files.po @@ -21,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\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 \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 11:49+0000\n" +"Last-Translator: JamFX \n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -131,11 +131,11 @@ msgstr "Ausstehend" #: js/files.js:256 msgid "1 file uploading" -msgstr "" +msgstr "Eine Datei wird hoch geladen" #: js/files.js:259 js/files.js:304 js/files.js:319 msgid "files uploading" -msgstr "" +msgstr "Dateien werden hoch geladen" #: js/files.js:322 js/files.js:355 msgid "Upload cancelled." @@ -150,81 +150,81 @@ msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload msgid "Invalid name, '/' is not allowed." msgstr "Ungültiger Name: \"/\" ist nicht erlaubt." -#: js/files.js:667 +#: js/files.js:668 msgid "files scanned" msgstr "Dateien gescannt" -#: js/files.js:675 +#: js/files.js:676 msgid "error while scanning" msgstr "Fehler beim Scannen" -#: js/files.js:748 templates/index.php:48 +#: js/files.js:749 templates/index.php:48 msgid "Name" msgstr "Name" -#: js/files.js:749 templates/index.php:56 +#: js/files.js:750 templates/index.php:56 msgid "Size" msgstr "Größe" -#: js/files.js:750 templates/index.php:58 +#: js/files.js:751 templates/index.php:58 msgid "Modified" msgstr "Bearbeitet" -#: js/files.js:777 +#: js/files.js:778 msgid "folder" msgstr "Ordner" -#: js/files.js:779 +#: js/files.js:780 msgid "folders" msgstr "Ordner" -#: js/files.js:787 +#: js/files.js:788 msgid "file" msgstr "Datei" -#: js/files.js:789 +#: js/files.js:790 msgid "files" msgstr "Dateien" -#: js/files.js:833 -msgid "seconds ago" -msgstr "" - #: js/files.js:834 -msgid "minute ago" -msgstr "" +msgid "seconds ago" +msgstr "Sekunden her" #: js/files.js:835 -msgid "minutes ago" -msgstr "" +msgid "minute ago" +msgstr "Minute her" -#: js/files.js:838 -msgid "today" -msgstr "" +#: js/files.js:836 +msgid "minutes ago" +msgstr "Minuten her" #: js/files.js:839 -msgid "yesterday" -msgstr "" +msgid "today" +msgstr "Heute" #: js/files.js:840 -msgid "days ago" -msgstr "" +msgid "yesterday" +msgstr "Gestern" #: js/files.js:841 -msgid "last month" -msgstr "" +msgid "days ago" +msgstr "Tage her" -#: js/files.js:843 -msgid "months ago" -msgstr "" +#: js/files.js:842 +msgid "last month" +msgstr "Letzten Monat" #: js/files.js:844 -msgid "last year" -msgstr "" +msgid "months ago" +msgstr "Monate her" #: js/files.js:845 +msgid "last year" +msgstr "Letztes Jahr" + +#: js/files.js:846 msgid "years ago" -msgstr "" +msgstr "Jahre her" #: templates/admin.php:5 msgid "File handling" diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po index 9590b400a19..361afe1ce0c 100644 --- a/l10n/fi_FI/files.po +++ b/l10n/fi_FI/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-09-26 13:19+0200\n" -"PO-Revision-Date: 2012-09-26 11:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 12:21+0000\n" +"Last-Translator: Jiri Grönroos \n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -141,81 +141,81 @@ msgstr "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedos msgid "Invalid name, '/' is not allowed." msgstr "Virheellinen nimi, merkki '/' ei ole sallittu." -#: js/files.js:667 +#: js/files.js:668 msgid "files scanned" msgstr "" -#: js/files.js:675 +#: js/files.js:676 msgid "error while scanning" msgstr "" -#: js/files.js:748 templates/index.php:48 +#: js/files.js:749 templates/index.php:48 msgid "Name" msgstr "Nimi" -#: js/files.js:749 templates/index.php:56 +#: js/files.js:750 templates/index.php:56 msgid "Size" msgstr "Koko" -#: js/files.js:750 templates/index.php:58 +#: js/files.js:751 templates/index.php:58 msgid "Modified" msgstr "Muutettu" -#: js/files.js:777 +#: js/files.js:778 msgid "folder" msgstr "kansio" -#: js/files.js:779 +#: js/files.js:780 msgid "folders" msgstr "kansiota" -#: js/files.js:787 +#: js/files.js:788 msgid "file" msgstr "tiedosto" -#: js/files.js:789 +#: js/files.js:790 msgid "files" msgstr "tiedostoa" -#: js/files.js:833 -msgid "seconds ago" -msgstr "" - #: js/files.js:834 -msgid "minute ago" -msgstr "" +msgid "seconds ago" +msgstr "sekuntia sitten" #: js/files.js:835 -msgid "minutes ago" -msgstr "" +msgid "minute ago" +msgstr "minuutti sitten" -#: js/files.js:838 -msgid "today" -msgstr "" +#: js/files.js:836 +msgid "minutes ago" +msgstr "minuuttia sitten" #: js/files.js:839 -msgid "yesterday" -msgstr "" +msgid "today" +msgstr "tänään" #: js/files.js:840 -msgid "days ago" -msgstr "" +msgid "yesterday" +msgstr "eilen" #: js/files.js:841 -msgid "last month" -msgstr "" +msgid "days ago" +msgstr "päivää sitten" -#: js/files.js:843 -msgid "months ago" -msgstr "" +#: js/files.js:842 +msgid "last month" +msgstr "viime kuussa" #: js/files.js:844 -msgid "last year" -msgstr "" +msgid "months ago" +msgstr "kuukautta sitten" #: js/files.js:845 +msgid "last year" +msgstr "viime vuonna" + +#: js/files.js:846 msgid "years ago" -msgstr "" +msgstr "vuotta sitten" #: templates/admin.php:5 msgid "File handling" diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po index 9817d499c7f..8bdb2b410f9 100644 --- a/l10n/fi_FI/files_sharing.po +++ b/l10n/fi_FI/files_sharing.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-09-22 01:14+0200\n" -"PO-Revision-Date: 2012-09-21 23:15+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 12:20+0000\n" +"Last-Translator: Jiri Grönroos \n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,12 +30,12 @@ msgstr "Lähetä" #: templates/public.php:9 #, php-format msgid "%s shared the folder %s with you" -msgstr "" +msgstr "%s jakoi kansion %s kanssasi" #: templates/public.php:11 #, php-format msgid "%s shared the file %s with you" -msgstr "" +msgstr "%s jakoi tiedoston %s kanssasi" #: templates/public.php:14 templates/public.php:30 msgid "Download" diff --git a/l10n/fi_FI/files_versions.po b/l10n/fi_FI/files_versions.po index 3a27d9ef9f7..ab692d6056c 100644 --- a/l10n/fi_FI/files_versions.po +++ b/l10n/fi_FI/files_versions.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-09-22 01:14+0200\n" -"PO-Revision-Date: 2012-09-21 23:15+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 12:22+0000\n" +"Last-Translator: Jiri Grönroos \n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +24,7 @@ msgstr "Vanhenna kaikki versiot" #: js/versions.js:16 msgid "History" -msgstr "" +msgstr "Historia" #: templates/settings-personal.php:4 msgid "Versions" diff --git a/l10n/fr/core.po b/l10n/fr/core.po index fd3b16d1023..62dfb286cb0 100644 --- a/l10n/fr/core.po +++ b/l10n/fr/core.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Christophe Lherieau , 2012. # , 2012. # Guillaume Paumier , 2012. # Nahir Mohamed , 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-09-26 13:19+0200\n" -"PO-Revision-Date: 2012-09-26 11:19+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 13:01+0000\n" +"Last-Translator: Christophe Lherieau \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" @@ -214,7 +215,7 @@ msgstr "Protégé par un mot de passe" #: js/share.js:489 msgid "Error unsetting expiration date" -msgstr "" +msgstr "Un erreur est survenue pendant la suppression de la date d'expiration" #: js/share.js:501 msgid "Error setting expiration date" diff --git a/l10n/fr/files.po b/l10n/fr/files.po index a153fdf5c58..b4ed9df3a69 100644 --- a/l10n/fr/files.po +++ b/l10n/fr/files.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Christophe Lherieau , 2012. # Cyril Glapa , 2012. # Geoffrey Guerrier , 2012. # , 2012. @@ -16,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\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 \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 12:42+0000\n" +"Last-Translator: Christophe Lherieau \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" @@ -126,11 +127,11 @@ msgstr "En cours" #: js/files.js:256 msgid "1 file uploading" -msgstr "" +msgstr "1 fichier en cours de téléchargement" #: js/files.js:259 js/files.js:304 js/files.js:319 msgid "files uploading" -msgstr "" +msgstr "fichiers en cours de téléchargement" #: js/files.js:322 js/files.js:355 msgid "Upload cancelled." @@ -145,81 +146,81 @@ msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera msgid "Invalid name, '/' is not allowed." msgstr "Nom invalide, '/' n'est pas autorisé." -#: js/files.js:667 +#: js/files.js:668 msgid "files scanned" msgstr "fichiers indexés" -#: js/files.js:675 +#: js/files.js:676 msgid "error while scanning" msgstr "erreur lors de l'indexation" -#: js/files.js:748 templates/index.php:48 +#: js/files.js:749 templates/index.php:48 msgid "Name" msgstr "Nom" -#: js/files.js:749 templates/index.php:56 +#: js/files.js:750 templates/index.php:56 msgid "Size" msgstr "Taille" -#: js/files.js:750 templates/index.php:58 +#: js/files.js:751 templates/index.php:58 msgid "Modified" msgstr "Modifié" -#: js/files.js:777 +#: js/files.js:778 msgid "folder" msgstr "dossier" -#: js/files.js:779 +#: js/files.js:780 msgid "folders" msgstr "dossiers" -#: js/files.js:787 +#: js/files.js:788 msgid "file" msgstr "fichier" -#: js/files.js:789 +#: js/files.js:790 msgid "files" msgstr "fichiers" -#: js/files.js:833 -msgid "seconds ago" -msgstr "" - #: js/files.js:834 -msgid "minute ago" -msgstr "" +msgid "seconds ago" +msgstr "secondes passées" #: js/files.js:835 -msgid "minutes ago" -msgstr "" +msgid "minute ago" +msgstr "minute passée" -#: js/files.js:838 -msgid "today" -msgstr "" +#: js/files.js:836 +msgid "minutes ago" +msgstr "minutes passées" #: js/files.js:839 -msgid "yesterday" -msgstr "" +msgid "today" +msgstr "aujourd'hui" #: js/files.js:840 -msgid "days ago" -msgstr "" +msgid "yesterday" +msgstr "hier" #: js/files.js:841 -msgid "last month" -msgstr "" +msgid "days ago" +msgstr "jours passés" -#: js/files.js:843 -msgid "months ago" -msgstr "" +#: js/files.js:842 +msgid "last month" +msgstr "mois dernier" #: js/files.js:844 -msgid "last year" -msgstr "" +msgid "months ago" +msgstr "mois passés" #: js/files.js:845 +msgid "last year" +msgstr "année dernière" + +#: js/files.js:846 msgid "years ago" -msgstr "" +msgstr "années passées" #: templates/admin.php:5 msgid "File handling" diff --git a/l10n/it/core.po b/l10n/it/core.po index 7f84ec32808..2c15ee03263 100644 --- a/l10n/it/core.po +++ b/l10n/it/core.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-09-26 13:19+0200\n" -"PO-Revision-Date: 2012-09-26 11:19+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 11:52+0000\n" +"Last-Translator: Vincenzo Reale \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" @@ -213,7 +213,7 @@ msgstr "Protetta da password" #: js/share.js:489 msgid "Error unsetting expiration date" -msgstr "" +msgstr "Errore durante la rimozione della data di scadenza" #: js/share.js:501 msgid "Error setting expiration date" diff --git a/l10n/it/files.po b/l10n/it/files.po index 53f5157beea..0677f2ddd44 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-09-26 13:19+0200\n" -"PO-Revision-Date: 2012-09-26 11:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 12:00+0000\n" +"Last-Translator: Vincenzo Reale \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" @@ -121,11 +121,11 @@ msgstr "In corso" #: js/files.js:256 msgid "1 file uploading" -msgstr "" +msgstr "1 file in fase di caricamento" #: js/files.js:259 js/files.js:304 js/files.js:319 msgid "files uploading" -msgstr "" +msgstr "file in fase di caricamento" #: js/files.js:322 js/files.js:355 msgid "Upload cancelled." @@ -140,81 +140,81 @@ msgstr "Caricamento del file in corso. La chiusura della pagina annullerà il ca msgid "Invalid name, '/' is not allowed." msgstr "Nome non valido" -#: js/files.js:667 +#: js/files.js:668 msgid "files scanned" msgstr "file analizzati" -#: js/files.js:675 +#: js/files.js:676 msgid "error while scanning" msgstr "errore durante la scansione" -#: js/files.js:748 templates/index.php:48 +#: js/files.js:749 templates/index.php:48 msgid "Name" msgstr "Nome" -#: js/files.js:749 templates/index.php:56 +#: js/files.js:750 templates/index.php:56 msgid "Size" msgstr "Dimensione" -#: js/files.js:750 templates/index.php:58 +#: js/files.js:751 templates/index.php:58 msgid "Modified" msgstr "Modificato" -#: js/files.js:777 +#: js/files.js:778 msgid "folder" msgstr "cartella" -#: js/files.js:779 +#: js/files.js:780 msgid "folders" msgstr "cartelle" -#: js/files.js:787 +#: js/files.js:788 msgid "file" msgstr "file" -#: js/files.js:789 +#: js/files.js:790 msgid "files" msgstr "file" -#: js/files.js:833 -msgid "seconds ago" -msgstr "" - #: js/files.js:834 -msgid "minute ago" -msgstr "" +msgid "seconds ago" +msgstr "secondi fa" #: js/files.js:835 -msgid "minutes ago" -msgstr "" +msgid "minute ago" +msgstr "minuto fa" -#: js/files.js:838 -msgid "today" -msgstr "" +#: js/files.js:836 +msgid "minutes ago" +msgstr "minuti fa" #: js/files.js:839 -msgid "yesterday" -msgstr "" +msgid "today" +msgstr "oggi" #: js/files.js:840 -msgid "days ago" -msgstr "" +msgid "yesterday" +msgstr "ieri" #: js/files.js:841 -msgid "last month" -msgstr "" +msgid "days ago" +msgstr "giorni fa" -#: js/files.js:843 -msgid "months ago" -msgstr "" +#: js/files.js:842 +msgid "last month" +msgstr "mese scorso" #: js/files.js:844 -msgid "last year" -msgstr "" +msgid "months ago" +msgstr "mesi fa" #: js/files.js:845 +msgid "last year" +msgstr "anno scorso" + +#: js/files.js:846 msgid "years ago" -msgstr "" +msgstr "anni fa" #: templates/admin.php:5 msgid "File handling" diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po index 371177dcc82..6f0f826640e 100644 --- a/l10n/pt_BR/core.po +++ b/l10n/pt_BR/core.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-26 13:19+0200\n" -"PO-Revision-Date: 2012-09-26 11:19+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 12:25+0000\n" +"Last-Translator: sedir \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -214,7 +214,7 @@ msgstr "Protegido com senha" #: js/share.js:489 msgid "Error unsetting expiration date" -msgstr "" +msgstr "Erro ao remover data de expiração" #: js/share.js:501 msgid "Error setting expiration date" diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po index 0f6de71c51f..a262359b9cf 100644 --- a/l10n/pt_BR/files.po +++ b/l10n/pt_BR/files.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\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 \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 12:31+0000\n" +"Last-Translator: sedir \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -123,11 +123,11 @@ msgstr "Pendente" #: js/files.js:256 msgid "1 file uploading" -msgstr "" +msgstr "enviando 1 arquivo" #: js/files.js:259 js/files.js:304 js/files.js:319 msgid "files uploading" -msgstr "" +msgstr "enviando arquivos" #: js/files.js:322 js/files.js:355 msgid "Upload cancelled." @@ -142,81 +142,81 @@ msgstr "Upload em andamento. Sair da página agora resultará no cancelamento do msgid "Invalid name, '/' is not allowed." msgstr "Nome inválido, '/' não é permitido." -#: js/files.js:667 +#: js/files.js:668 msgid "files scanned" msgstr "arquivos verificados" -#: js/files.js:675 +#: js/files.js:676 msgid "error while scanning" msgstr "erro durante verificação" -#: js/files.js:748 templates/index.php:48 +#: js/files.js:749 templates/index.php:48 msgid "Name" msgstr "Nome" -#: js/files.js:749 templates/index.php:56 +#: js/files.js:750 templates/index.php:56 msgid "Size" msgstr "Tamanho" -#: js/files.js:750 templates/index.php:58 +#: js/files.js:751 templates/index.php:58 msgid "Modified" msgstr "Modificado" -#: js/files.js:777 +#: js/files.js:778 msgid "folder" msgstr "pasta" -#: js/files.js:779 +#: js/files.js:780 msgid "folders" msgstr "pastas" -#: js/files.js:787 +#: js/files.js:788 msgid "file" msgstr "arquivo" -#: js/files.js:789 +#: js/files.js:790 msgid "files" msgstr "arquivos" -#: js/files.js:833 -msgid "seconds ago" -msgstr "" - #: js/files.js:834 -msgid "minute ago" -msgstr "" +msgid "seconds ago" +msgstr "segundos atrás" #: js/files.js:835 -msgid "minutes ago" -msgstr "" +msgid "minute ago" +msgstr "minuto atrás" -#: js/files.js:838 -msgid "today" -msgstr "" +#: js/files.js:836 +msgid "minutes ago" +msgstr "minutos atrás" #: js/files.js:839 -msgid "yesterday" -msgstr "" +msgid "today" +msgstr "hoje" #: js/files.js:840 -msgid "days ago" -msgstr "" +msgid "yesterday" +msgstr "ontem" #: js/files.js:841 -msgid "last month" -msgstr "" +msgid "days ago" +msgstr "dias atrás" -#: js/files.js:843 -msgid "months ago" -msgstr "" +#: js/files.js:842 +msgid "last month" +msgstr "último mês" #: js/files.js:844 -msgid "last year" -msgstr "" +msgid "months ago" +msgstr "meses atrás" #: js/files.js:845 +msgid "last year" +msgstr "último ano" + +#: js/files.js:846 msgid "years ago" -msgstr "" +msgstr "anos atrás" #: templates/admin.php:5 msgid "File handling" diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po index ea24c46071b..803037caf42 100644 --- a/l10n/pt_PT/files_encryption.po +++ b/l10n/pt_PT/files_encryption.po @@ -3,32 +3,33 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Duarte Velez Grilo , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-13 23:12+0200\n" -"PO-Revision-Date: 2012-08-12 22:33+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 13:24+0000\n" +"Last-Translator: Duarte Velez Grilo \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" "Content-Transfer-Encoding: 8bit\n" "Language: pt_PT\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:3 msgid "Encryption" -msgstr "" +msgstr "Encriptação" #: templates/settings.php:4 msgid "Exclude the following file types from encryption" -msgstr "" +msgstr "Excluir da encriptação os seguintes tipo de ficheiros" #: templates/settings.php:5 msgid "None" -msgstr "" +msgstr "Nenhum" #: templates/settings.php:10 msgid "Enable Encryption" -msgstr "" +msgstr "Activar Encriptação" diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po index b0c55a3de6e..bac559da630 100644 --- a/l10n/pt_PT/files_external.po +++ b/l10n/pt_PT/files_external.po @@ -3,19 +3,20 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Duarte Velez Grilo , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-13 23:12+0200\n" -"PO-Revision-Date: 2012-08-12 22:34+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 13:10+0000\n" +"Last-Translator: Duarte Velez Grilo \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" "Content-Transfer-Encoding: 8bit\n" "Language: pt_PT\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:3 msgid "External Storage" @@ -31,15 +32,15 @@ msgstr "" #: templates/settings.php:9 msgid "Configuration" -msgstr "" +msgstr "Configuração" #: templates/settings.php:10 msgid "Options" -msgstr "" +msgstr "Opções" #: templates/settings.php:11 msgid "Applicable" -msgstr "" +msgstr "Aplicável" #: templates/settings.php:23 msgid "Add mount point" @@ -51,32 +52,32 @@ msgstr "" #: templates/settings.php:63 msgid "All Users" -msgstr "" +msgstr "Todos os utilizadores" #: templates/settings.php:64 msgid "Groups" -msgstr "" +msgstr "Grupos" #: templates/settings.php:69 msgid "Users" -msgstr "" +msgstr "Utilizadores" -#: templates/settings.php:77 templates/settings.php:96 +#: templates/settings.php:77 templates/settings.php:107 msgid "Delete" -msgstr "" +msgstr "Apagar" -#: templates/settings.php:88 -msgid "SSL root certificates" -msgstr "" - -#: templates/settings.php:102 -msgid "Import Root Certificate" -msgstr "" - -#: templates/settings.php:108 +#: templates/settings.php:87 msgid "Enable User External Storage" msgstr "" -#: templates/settings.php:109 +#: templates/settings.php:88 msgid "Allow users to mount their own external storage" msgstr "" + +#: templates/settings.php:99 +msgid "SSL root certificates" +msgstr "" + +#: templates/settings.php:113 +msgid "Import Root Certificate" +msgstr "Importar Certificado Root" diff --git a/l10n/pt_PT/files_versions.po b/l10n/pt_PT/files_versions.po index 317fd2ed31c..4da2f774a10 100644 --- a/l10n/pt_PT/files_versions.po +++ b/l10n/pt_PT/files_versions.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Duarte Velez Grilo , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-22 01:14+0200\n" -"PO-Revision-Date: 2012-09-21 23:15+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 13:15+0000\n" +"Last-Translator: Duarte Velez Grilo \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" @@ -19,19 +20,19 @@ msgstr "" #: js/settings-personal.js:31 templates/settings-personal.php:10 msgid "Expire all versions" -msgstr "" +msgstr "Expirar todas as versões" #: js/versions.js:16 msgid "History" -msgstr "" +msgstr "Histórico" #: templates/settings-personal.php:4 msgid "Versions" -msgstr "" +msgstr "Versões" #: templates/settings-personal.php:7 msgid "This will delete all existing backup versions of your files" -msgstr "" +msgstr "Isto irá apagar todas as versões de backup do seus ficheiros" #: templates/settings.php:3 msgid "Files Versioning" @@ -39,4 +40,4 @@ msgstr "" #: templates/settings.php:4 msgid "Enable" -msgstr "" +msgstr "Activar" diff --git a/l10n/ro/core.po b/l10n/ro/core.po index ff02e7210f6..aa411156948 100644 --- a/l10n/ro/core.po +++ b/l10n/ro/core.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-09-26 13:19+0200\n" -"PO-Revision-Date: 2012-09-26 11:19+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 13:12+0000\n" +"Last-Translator: g.ciprian \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -87,7 +87,7 @@ msgstr "Decembrie" #: js/oc-dialogs.js:123 msgid "Choose" -msgstr "" +msgstr "Alege" #: js/oc-dialogs.js:143 js/oc-dialogs.js:163 msgid "Cancel" @@ -116,37 +116,37 @@ msgstr "Eroare" #: js/share.js:103 msgid "Error while sharing" -msgstr "" +msgstr "Eroare la partajare" #: js/share.js:114 msgid "Error while unsharing" -msgstr "" +msgstr "Eroare la anularea partajării" #: js/share.js:121 msgid "Error while changing permissions" -msgstr "" +msgstr "Eroare la modificarea permisiunilor" #: js/share.js:130 #, python-format msgid "Shared with you and the group %s by %s" -msgstr "" +msgstr "Partajat cu tine și grupul %s de %s" #: js/share.js:132 #, python-format msgid "Shared with you by %s" -msgstr "" +msgstr "Partajat cu tine de %s" #: js/share.js:137 msgid "Share with" -msgstr "" +msgstr "Partajat cu" #: js/share.js:142 msgid "Share with link" -msgstr "" +msgstr "Partajare cu legătură" #: js/share.js:143 msgid "Password protect" -msgstr "" +msgstr "Protejare cu parolă" #: js/share.js:147 templates/installation.php:30 templates/login.php:13 msgid "Password" @@ -154,69 +154,69 @@ msgstr "Parola" #: js/share.js:152 msgid "Set expiration date" -msgstr "" +msgstr "Specifică data expirării" #: js/share.js:153 msgid "Expiration date" -msgstr "" +msgstr "Data expirării" #: js/share.js:185 #, python-format msgid "Share via email: %s" -msgstr "" +msgstr "Partajare prin email: %s" #: js/share.js:187 msgid "No people found" -msgstr "" +msgstr "Nici o persoană găsită" #: js/share.js:214 msgid "Resharing is not allowed" -msgstr "" +msgstr "Repartajarea nu este permisă" #: js/share.js:250 #, python-format msgid "Shared in %s with %s" -msgstr "" +msgstr "Partajat în %s cu %s" #: js/share.js:271 msgid "Unshare" -msgstr "" +msgstr "Anulare partajare" #: js/share.js:279 msgid "can edit" -msgstr "" +msgstr "poate edita" #: js/share.js:281 msgid "access control" -msgstr "" +msgstr "control acces" #: js/share.js:284 msgid "create" -msgstr "" +msgstr "creare" #: js/share.js:287 msgid "update" -msgstr "" +msgstr "actualizare" #: js/share.js:290 msgid "delete" -msgstr "" +msgstr "ștergere" #: js/share.js:293 msgid "share" -msgstr "" +msgstr "partajare" #: js/share.js:317 js/share.js:476 msgid "Password protected" -msgstr "" +msgstr "Protejare cu parolă" #: js/share.js:489 msgid "Error unsetting expiration date" -msgstr "" +msgstr "Eroare la anularea datei de expirare" #: js/share.js:501 msgid "Error setting expiration date" -msgstr "" +msgstr "Eroare la specificarea datei de expirare" #: lostpassword/index.php:26 msgid "ownCloud password reset" diff --git a/l10n/ro/files.po b/l10n/ro/files.po index a659e0b493d..ebc77fb07be 100644 --- a/l10n/ro/files.po +++ b/l10n/ro/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-09-26 13:19+0200\n" -"PO-Revision-Date: 2012-09-26 11:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 13:07+0000\n" +"Last-Translator: g.ciprian \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -65,7 +65,7 @@ msgstr "Șterge" #: js/fileactions.js:182 msgid "Rename" -msgstr "" +msgstr "Redenumire" #: js/filelist.js:190 js/filelist.js:192 msgid "already exists" @@ -121,11 +121,11 @@ msgstr "În așteptare" #: js/files.js:256 msgid "1 file uploading" -msgstr "" +msgstr "un fișier se încarcă" #: js/files.js:259 js/files.js:304 js/files.js:319 msgid "files uploading" -msgstr "" +msgstr "fișiere se încarcă" #: js/files.js:322 js/files.js:355 msgid "Upload cancelled." @@ -140,81 +140,81 @@ msgstr "Fișierul este în curs de încărcare. Părăsirea paginii va întrerup msgid "Invalid name, '/' is not allowed." msgstr "Nume invalid, '/' nu este permis." -#: js/files.js:667 +#: js/files.js:668 msgid "files scanned" msgstr "fișiere scanate" -#: js/files.js:675 +#: js/files.js:676 msgid "error while scanning" msgstr "eroare la scanarea" -#: js/files.js:748 templates/index.php:48 +#: js/files.js:749 templates/index.php:48 msgid "Name" msgstr "Nume" -#: js/files.js:749 templates/index.php:56 +#: js/files.js:750 templates/index.php:56 msgid "Size" msgstr "Dimensiune" -#: js/files.js:750 templates/index.php:58 +#: js/files.js:751 templates/index.php:58 msgid "Modified" msgstr "Modificat" -#: js/files.js:777 +#: js/files.js:778 msgid "folder" msgstr "director" -#: js/files.js:779 +#: js/files.js:780 msgid "folders" msgstr "directoare" -#: js/files.js:787 +#: js/files.js:788 msgid "file" msgstr "fișier" -#: js/files.js:789 +#: js/files.js:790 msgid "files" msgstr "fișiere" -#: js/files.js:833 -msgid "seconds ago" -msgstr "" - #: js/files.js:834 -msgid "minute ago" -msgstr "" +msgid "seconds ago" +msgstr "secunde în urmă" #: js/files.js:835 -msgid "minutes ago" -msgstr "" +msgid "minute ago" +msgstr "minut în urmă" -#: js/files.js:838 -msgid "today" -msgstr "" +#: js/files.js:836 +msgid "minutes ago" +msgstr "minute în urmă" #: js/files.js:839 -msgid "yesterday" -msgstr "" +msgid "today" +msgstr "astăzi" #: js/files.js:840 -msgid "days ago" -msgstr "" +msgid "yesterday" +msgstr "ieri" #: js/files.js:841 -msgid "last month" -msgstr "" +msgid "days ago" +msgstr "zile în urmă" -#: js/files.js:843 -msgid "months ago" -msgstr "" +#: js/files.js:842 +msgid "last month" +msgstr "ultima lună" #: js/files.js:844 -msgid "last year" -msgstr "" +msgid "months ago" +msgstr "luni în urmă" #: js/files.js:845 +msgid "last year" +msgstr "ultimul an" + +#: js/files.js:846 msgid "years ago" -msgstr "" +msgstr "ani în urmă" #: templates/admin.php:5 msgid "File handling" diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po index d218ac95863..7966d650dad 100644 --- a/l10n/ro/files_sharing.po +++ b/l10n/ro/files_sharing.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-09-22 01:14+0200\n" -"PO-Revision-Date: 2012-09-21 23:15+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 13:27+0000\n" +"Last-Translator: g.ciprian \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,12 +29,12 @@ msgstr "Trimite" #: templates/public.php:9 #, php-format msgid "%s shared the folder %s with you" -msgstr "" +msgstr "%s a partajat directorul %s cu tine" #: templates/public.php:11 #, php-format msgid "%s shared the file %s with you" -msgstr "" +msgstr "%s a partajat fișierul %s cu tine" #: templates/public.php:14 templates/public.php:30 msgid "Download" diff --git a/l10n/ro/files_versions.po b/l10n/ro/files_versions.po index 325123ac1fc..d3058eb6ed2 100644 --- a/l10n/ro/files_versions.po +++ b/l10n/ro/files_versions.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-09-22 01:14+0200\n" -"PO-Revision-Date: 2012-09-21 23:15+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 13:05+0000\n" +"Last-Translator: g.ciprian \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +24,7 @@ msgstr "Expiră toate versiunile" #: js/versions.js:16 msgid "History" -msgstr "" +msgstr "Istoric" #: templates/settings-personal.php:4 msgid "Versions" diff --git a/l10n/sv/core.po b/l10n/sv/core.po index cca206db7c9..5960e5969f2 100644 --- a/l10n/sv/core.po +++ b/l10n/sv/core.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-26 13:19+0200\n" -"PO-Revision-Date: 2012-09-26 11:19+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 12:40+0000\n" +"Last-Translator: Magnus Höglund \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -214,7 +214,7 @@ msgstr "Lösenordsskyddad" #: js/share.js:489 msgid "Error unsetting expiration date" -msgstr "" +msgstr "Fel vid borttagning av utgångsdatum" #: js/share.js:501 msgid "Error setting expiration date" diff --git a/l10n/sv/files.po b/l10n/sv/files.po index 4d66c6133d3..4154c1118ee 100644 --- a/l10n/sv/files.po +++ b/l10n/sv/files.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\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 \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 14:51+0000\n" +"Last-Translator: Magnus Höglund \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -123,11 +123,11 @@ msgstr "Väntar" #: js/files.js:256 msgid "1 file uploading" -msgstr "" +msgstr "1 filuppladdning" #: js/files.js:259 js/files.js:304 js/files.js:319 msgid "files uploading" -msgstr "" +msgstr "filer laddas upp" #: js/files.js:322 js/files.js:355 msgid "Upload cancelled." @@ -142,81 +142,81 @@ msgstr "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen." msgid "Invalid name, '/' is not allowed." msgstr "Ogiltigt namn, '/' är inte tillåten." -#: js/files.js:667 +#: js/files.js:668 msgid "files scanned" msgstr "filer skannade" -#: js/files.js:675 +#: js/files.js:676 msgid "error while scanning" msgstr "fel vid skanning" -#: js/files.js:748 templates/index.php:48 +#: js/files.js:749 templates/index.php:48 msgid "Name" msgstr "Namn" -#: js/files.js:749 templates/index.php:56 +#: js/files.js:750 templates/index.php:56 msgid "Size" msgstr "Storlek" -#: js/files.js:750 templates/index.php:58 +#: js/files.js:751 templates/index.php:58 msgid "Modified" msgstr "Ändrad" -#: js/files.js:777 +#: js/files.js:778 msgid "folder" msgstr "mapp" -#: js/files.js:779 +#: js/files.js:780 msgid "folders" msgstr "mappar" -#: js/files.js:787 +#: js/files.js:788 msgid "file" msgstr "fil" -#: js/files.js:789 +#: js/files.js:790 msgid "files" msgstr "filer" -#: js/files.js:833 -msgid "seconds ago" -msgstr "" - #: js/files.js:834 -msgid "minute ago" -msgstr "" +msgid "seconds ago" +msgstr "sekunder sedan" #: js/files.js:835 -msgid "minutes ago" -msgstr "" +msgid "minute ago" +msgstr "minut sedan" -#: js/files.js:838 -msgid "today" -msgstr "" +#: js/files.js:836 +msgid "minutes ago" +msgstr "minuter sedan" #: js/files.js:839 -msgid "yesterday" -msgstr "" +msgid "today" +msgstr "i dag" #: js/files.js:840 -msgid "days ago" -msgstr "" +msgid "yesterday" +msgstr "i går" #: js/files.js:841 -msgid "last month" -msgstr "" +msgid "days ago" +msgstr "dagar sedan" -#: js/files.js:843 -msgid "months ago" -msgstr "" +#: js/files.js:842 +msgid "last month" +msgstr "förra månaden" #: js/files.js:844 -msgid "last year" -msgstr "" +msgid "months ago" +msgstr "månader sedan" #: js/files.js:845 +msgid "last year" +msgstr "förra året" + +#: js/files.js:846 msgid "years ago" -msgstr "" +msgstr "år sedan" #: templates/admin.php:5 msgid "File handling" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 889f7634153..3dd88c79dbf 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-09-26 13:19+0200\n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index b7509900b43..c59c25fdcb3 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-09-26 13:19+0200\n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -136,79 +136,79 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:667 +#: js/files.js:668 msgid "files scanned" msgstr "" -#: js/files.js:675 +#: js/files.js:676 msgid "error while scanning" msgstr "" -#: js/files.js:748 templates/index.php:48 +#: js/files.js:749 templates/index.php:48 msgid "Name" msgstr "" -#: js/files.js:749 templates/index.php:56 +#: js/files.js:750 templates/index.php:56 msgid "Size" msgstr "" -#: js/files.js:750 templates/index.php:58 +#: js/files.js:751 templates/index.php:58 msgid "Modified" msgstr "" -#: js/files.js:777 +#: js/files.js:778 msgid "folder" msgstr "" -#: js/files.js:779 +#: js/files.js:780 msgid "folders" msgstr "" -#: js/files.js:787 +#: js/files.js:788 msgid "file" msgstr "" -#: js/files.js:789 +#: js/files.js:790 msgid "files" msgstr "" -#: js/files.js:833 +#: js/files.js:834 msgid "seconds ago" msgstr "" -#: js/files.js:834 +#: js/files.js:835 msgid "minute ago" msgstr "" -#: js/files.js:835 +#: js/files.js:836 msgid "minutes ago" msgstr "" -#: js/files.js:838 +#: js/files.js:839 msgid "today" msgstr "" -#: js/files.js:839 +#: js/files.js:840 msgid "yesterday" msgstr "" -#: js/files.js:840 +#: js/files.js:841 msgid "days ago" msgstr "" -#: js/files.js:841 +#: js/files.js:842 msgid "last month" msgstr "" -#: js/files.js:843 +#: js/files.js:844 msgid "months ago" msgstr "" -#: js/files.js:844 +#: js/files.js:845 msgid "last year" msgstr "" -#: js/files.js:845 +#: js/files.js:846 msgid "years ago" msgstr "" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 80c5c832c0e..36387a9288c 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-09-26 13:19+0200\n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 20a4707ffd2..286aaaaaa1c 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-09-26 13:19+0200\n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index da19bcd57ff..9b14cb91822 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-09-26 13:19+0200\n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 40c1de29387..c844a192b32 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-09-26 13:19+0200\n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 9d922b91f01..1b312f927cd 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-09-26 13:19+0200\n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index c8201361ced..1ce4f67633e 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-09-26 13:19+0200\n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index ab0bd5e91fe..805cd0c4df8 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-09-26 13:19+0200\n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po index 184cc1c73d4..451fc576dae 100644 --- a/l10n/th_TH/core.po +++ b/l10n/th_TH/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-09-26 13:19+0200\n" -"PO-Revision-Date: 2012-09-26 11:19+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 11:22+0000\n" +"Last-Translator: AriesAnywhere Anywhere \n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -210,7 +210,7 @@ msgstr "ใส่รหัสผ่านไว้" #: js/share.js:489 msgid "Error unsetting expiration date" -msgstr "" +msgstr "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ" #: js/share.js:501 msgid "Error setting expiration date" diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po index 5ae1747f22a..51624d8fc18 100644 --- a/l10n/th_TH/files.po +++ b/l10n/th_TH/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-09-26 13:19+0200\n" -"PO-Revision-Date: 2012-09-26 11:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-27 02:01+0200\n" +"PO-Revision-Date: 2012-09-26 11:27+0000\n" +"Last-Translator: AriesAnywhere Anywhere \n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -119,11 +119,11 @@ msgstr "อยู่ระหว่างดำเนินการ" #: js/files.js:256 msgid "1 file uploading" -msgstr "" +msgstr "กำลังอัพโหลดไฟล์ 1 ไฟล์" #: js/files.js:259 js/files.js:304 js/files.js:319 msgid "files uploading" -msgstr "" +msgstr "การอัพโหลดไฟล์" #: js/files.js:322 js/files.js:355 msgid "Upload cancelled." @@ -138,81 +138,81 @@ msgstr "การอัพโหลดไฟล์กำลังอยู่ใ msgid "Invalid name, '/' is not allowed." msgstr "ชื่อที่ใช้ไม่ถูกต้อง '/' ไม่อนุญาตให้ใช้งาน" -#: js/files.js:667 +#: js/files.js:668 msgid "files scanned" msgstr "ไฟล์ต่างๆได้รับการสแกนแล้ว" -#: js/files.js:675 +#: js/files.js:676 msgid "error while scanning" msgstr "พบข้อผิดพลาดในระหว่างการสแกนไฟล์" -#: js/files.js:748 templates/index.php:48 +#: js/files.js:749 templates/index.php:48 msgid "Name" msgstr "ชื่อ" -#: js/files.js:749 templates/index.php:56 +#: js/files.js:750 templates/index.php:56 msgid "Size" msgstr "ขนาด" -#: js/files.js:750 templates/index.php:58 +#: js/files.js:751 templates/index.php:58 msgid "Modified" msgstr "ปรับปรุงล่าสุด" -#: js/files.js:777 +#: js/files.js:778 msgid "folder" msgstr "โฟลเดอร์" -#: js/files.js:779 +#: js/files.js:780 msgid "folders" msgstr "โฟลเดอร์" -#: js/files.js:787 +#: js/files.js:788 msgid "file" msgstr "ไฟล์" -#: js/files.js:789 +#: js/files.js:790 msgid "files" msgstr "ไฟล์" -#: js/files.js:833 -msgid "seconds ago" -msgstr "" - #: js/files.js:834 -msgid "minute ago" -msgstr "" +msgid "seconds ago" +msgstr "วินาที ก่อนหน้านี้" #: js/files.js:835 -msgid "minutes ago" -msgstr "" +msgid "minute ago" +msgstr "นาที ที่ผ่านมา" -#: js/files.js:838 -msgid "today" -msgstr "" +#: js/files.js:836 +msgid "minutes ago" +msgstr "นาที ที่ผ่านมา" #: js/files.js:839 -msgid "yesterday" -msgstr "" +msgid "today" +msgstr "วันนี้" #: js/files.js:840 -msgid "days ago" -msgstr "" +msgid "yesterday" +msgstr "เมื่อวานนี้" #: js/files.js:841 -msgid "last month" -msgstr "" +msgid "days ago" +msgstr "วัน ที่ผ่านมา" -#: js/files.js:843 -msgid "months ago" -msgstr "" +#: js/files.js:842 +msgid "last month" +msgstr "เดือนที่แล้ว" #: js/files.js:844 -msgid "last year" -msgstr "" +msgid "months ago" +msgstr "เดือน ที่ผ่านมา" #: js/files.js:845 +msgid "last year" +msgstr "ปีที่แล้ว" + +#: js/files.js:846 msgid "years ago" -msgstr "" +msgstr "ปี ที่ผ่านมา" #: templates/admin.php:5 msgid "File handling" From cf14ad2f7d1125c8c297f6db0b6ce99ed2783860 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Thu, 27 Sep 2012 04:10:19 +0200 Subject: [PATCH 04/42] RC 1 --- lib/util.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/util.php b/lib/util.php index 08412464254..1b4e45a4882 100755 --- a/lib/util.php +++ b/lib/util.php @@ -81,7 +81,7 @@ class OC_Util { */ public static function getVersion() { // hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4,9,0. This is not visible to the user - return array(4,84,10); + return array(4,85,10); } /** @@ -89,7 +89,7 @@ class OC_Util { * @return string */ public static function getVersionString() { - return '4.5 beta 4'; + return '4.5 RC 1'; } /** From a56f2ec183091dc6d95109806612454c66ce0f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 27 Sep 2012 11:20:37 +0200 Subject: [PATCH 05/42] only upload valid ssl root certificates --- .../ajax/addRootCertificate.php | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php index 8848f85cf9d..42927b86068 100644 --- a/apps/files_external/ajax/addRootCertificate.php +++ b/apps/files_external/ajax/addRootCertificate.php @@ -5,19 +5,27 @@ OCP\JSON::checkAppEnabled('files_external'); $fh = fopen($_FILES['rootcert_import']['tmp_name'], 'r'); $data = fread($fh, filesize($_FILES['rootcert_import']['tmp_name'])); fclose($fh); +$filename = $_FILES['rootcert_import']['name']; $view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_external/uploads'); if (!$view->file_exists('')) $view->mkdir(''); -//check if it is a PEM certificate, otherwise convert it if possible -if (!strpos($data, 'BEGIN CERTIFICATE')) { +$isValid = openssl_pkey_get_public($data); + +//maybe it was just the wrong file format, try to convert it... +if ($isValid == false) { $data = chunk_split(base64_encode($data), 64, "\n"); - $data = "-----BEGIN CERTIFICATE-----\n".$data."-----END CERTIFICATE-----\n"; + $data = "-----BEGIN CERTIFICATE-----\n".$data."-----END CERTIFICATE-----\n"; + $isValid = openssl_pkey_get_public($data); } -$view->file_put_contents($_FILES['rootcert_import']['name'], $data); - -OC_Mount_Config::createCertificateBundle(); +// add the certificate if it could be verified +if ( $isValid ) { + $view->file_put_contents($filename, $data); + OC_Mount_Config::createCertificateBundle(); +} else { + OCP\Util::writeLog("files_external", "Couldn't import SSL root certificate ($filename), allowed formats: PEM and DER", OCP\Util::WARN); +} header("Location: settings/personal.php"); exit; From aa9ffd119aea9a2cb527a0ac662fcdaad464fc68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 27 Sep 2012 12:37:23 +0200 Subject: [PATCH 06/42] check if file really exist before add/remove it --- apps/files_external/ajax/addRootCertificate.php | 5 +++++ apps/files_external/ajax/removeRootCertificate.php | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php index 42927b86068..e0a0239c954 100644 --- a/apps/files_external/ajax/addRootCertificate.php +++ b/apps/files_external/ajax/addRootCertificate.php @@ -2,6 +2,11 @@ OCP\JSON::checkAppEnabled('files_external'); +if ( !($filename = $_FILES['rootcert_import']['name']) ) { + header("Location: settings/personal.php"); + exit; +} + $fh = fopen($_FILES['rootcert_import']['tmp_name'], 'r'); $data = fread($fh, filesize($_FILES['rootcert_import']['tmp_name'])); fclose($fh); diff --git a/apps/files_external/ajax/removeRootCertificate.php b/apps/files_external/ajax/removeRootCertificate.php index 8c196eddf55..6871b0fd1d4 100644 --- a/apps/files_external/ajax/removeRootCertificate.php +++ b/apps/files_external/ajax/removeRootCertificate.php @@ -5,7 +5,10 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); $view = \OCP\Files::getStorage("files_external"); -$cert = ltrim($_POST['cert'], "/\\."); -$file = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("").'uploads/'.$cert; -unlink($file); -OC_Mount_Config::createCertificateBundle(); +$file = 'uploads/'.ltrim($_POST['cert'], "/\\."); + +if ( $view->file_exists($file) ) { + $view->unlink($file); + OC_Mount_Config::createCertificateBundle(); +} + From 3fa4b34a69ba291d39130dd4268595ec01f9f162 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 27 Sep 2012 19:52:52 +0200 Subject: [PATCH 07/42] LDAP: comparison, not assignment. Thanks to Manuel Delgado --- apps/user_ldap/group_ldap.php | 4 ++-- apps/user_ldap/user_ldap.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php index 5ec259f6c47..389679b80bd 100644 --- a/apps/user_ldap/group_ldap.php +++ b/apps/user_ldap/group_ldap.php @@ -143,7 +143,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface { if(!empty($this->groupSearch)) { $groupUsers = array_filter($groupUsers, array($this, 'groupMatchesFilter')); } - if($limit = -1) { + if($limit == -1) { $limit = null; } return array_slice($groupUsers, $offset, $limit); @@ -187,7 +187,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface { if(!empty($this->groupSearch)) { $groupUsers = array_filter($groupUsers, array($this, 'groupMatchesFilter')); } - if($limit = -1) { + if($limit == -1) { $limit = null; } return array_slice($groupUsers, $offset, $limit); diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index bacdb8b9ae1..53a65129108 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -111,7 +111,7 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface { if(!empty($this->userSearch)) { $ldap_users = array_filter($ldap_users, array($this, 'userMatchesFilter')); } - if($limit = -1) { + if($limit == -1) { $limit = null; } return array_slice($ldap_users, $offset, $limit); From 232936b99a8fb2a7020031add3b317ce58043d77 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 27 Sep 2012 22:24:51 +0200 Subject: [PATCH 08/42] This .gitkeep is unneeded --- apps/.gitkeep | 1 - 1 file changed, 1 deletion(-) delete mode 100644 apps/.gitkeep diff --git a/apps/.gitkeep b/apps/.gitkeep deleted file mode 100644 index 8d1c8b69c3f..00000000000 --- a/apps/.gitkeep +++ /dev/null @@ -1 +0,0 @@ - From e8df2eeefc0bf9142ab765ec816d45c84858888d Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 27 Sep 2012 22:49:01 +0200 Subject: [PATCH 09/42] some more sane column sizes for appconfig and preferences --- db_structure.xml | 14 +++++++------- lib/util.php | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/db_structure.xml b/db_structure.xml index b1e620f8499..99a30cb6137 100644 --- a/db_structure.xml +++ b/db_structure.xml @@ -18,7 +18,7 @@ text true - 255 + 32 @@ -26,7 +26,7 @@ text true - 255 + 64 @@ -310,7 +310,7 @@ text false - 200 + 64 @@ -379,7 +379,7 @@ text true - 255 + 64 @@ -387,7 +387,7 @@ text true - 255 + 32 @@ -395,7 +395,7 @@ text true - 255 + 64 @@ -435,7 +435,7 @@ text true - 200 + 64 diff --git a/lib/util.php b/lib/util.php index 1b4e45a4882..c89c4d8c7c1 100755 --- a/lib/util.php +++ b/lib/util.php @@ -81,7 +81,7 @@ class OC_Util { */ public static function getVersion() { // hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4,9,0. This is not visible to the user - return array(4,85,10); + return array(4,85,11); } /** From 5144d26088b98685a37c73c776a9a47203efa68a Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Fri, 28 Sep 2012 02:06:03 +0200 Subject: [PATCH 10/42] [tx-robot] updated from transifex --- apps/files/l10n/de.php | 12 ++--- apps/files/l10n/ja_JP.php | 12 +++++ apps/files/l10n/zh_CN.php | 12 +++++ apps/files_sharing/l10n/zh_CN.php | 9 ++++ core/l10n/de.php | 14 +++--- core/l10n/ja_JP.php | 1 + core/l10n/zh_CN.php | 25 ++++++++++ l10n/de/core.po | 20 ++++---- l10n/de/files.po | 19 ++++---- l10n/de/lib.po | 19 ++++---- l10n/de/settings.po | 51 ++++++++++---------- l10n/ja_JP/core.po | 8 +-- l10n/ja_JP/files.po | 74 ++++++++++++++-------------- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/zh_CN/core.po | 57 +++++++++++----------- l10n/zh_CN/files.po | 75 +++++++++++++++-------------- l10n/zh_CN/files_sharing.po | 21 ++++---- l10n/zh_CN/settings.po | 27 ++++++----- lib/l10n/de.php | 4 +- settings/l10n/de.php | 44 ++++++++--------- settings/l10n/zh_CN.php | 18 ++++--- 29 files changed, 304 insertions(+), 236 deletions(-) create mode 100644 apps/files_sharing/l10n/zh_CN.php diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php index ef2cd8b673a..fc07c9b911e 100644 --- a/apps/files/l10n/de.php +++ b/apps/files/l10n/de.php @@ -7,7 +7,7 @@ "Missing a temporary folder" => "Temporärer Ordner fehlt.", "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte", "Files" => "Dateien", -"Unshare" => "Nicht mehr teilen", +"Unshare" => "Nicht mehr freigeben", "Delete" => "Löschen", "Rename" => "Umbenennen", "already exists" => "ist bereits vorhanden", @@ -17,15 +17,15 @@ "replaced" => "ersetzt", "undo" => "rückgängig machen", "with" => "mit", -"unshared" => "Nicht mehr teilen", +"unshared" => "Nicht mehr freigegeben", "deleted" => "gelöscht", "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 ist oder 0 Bytes hat.", -"Upload Error" => "Fehler beim Hochladen", +"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", "Pending" => "Ausstehend", "1 file uploading" => "Eine Datei wird hoch geladen", "files uploading" => "Dateien werden hoch geladen", -"Upload cancelled." => "Hochladen abgebrochen.", +"Upload cancelled." => "Upload abgebrochen.", "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.", "Invalid name, '/' is not allowed." => "Ungültiger Name: \"/\" ist nicht erlaubt.", "files scanned" => "Dateien gescannt", @@ -58,7 +58,7 @@ "New" => "Neu", "Text file" => "Textdatei", "Folder" => "Ordner", -"From url" => "URL", +"From url" => "Von einer URL", "Upload" => "Hochladen", "Cancel upload" => "Upload abbrechen", "Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!", diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php index f0d016ec9c4..7aa246f9644 100644 --- a/apps/files/l10n/ja_JP.php +++ b/apps/files/l10n/ja_JP.php @@ -23,6 +23,8 @@ "Unable to upload your file as it is a directory or has 0 bytes" => "アップロード使用としているファイルがディレクトリ、もしくはサイズが0バイトのため、アップロードできません。", "Upload Error" => "アップロードエラー", "Pending" => "保留", +"1 file uploading" => "ファイルを1つアップロード中", +"files uploading" => "ファイルをアップロード中", "Upload cancelled." => "アップロードはキャンセルされました。", "File upload is in progress. Leaving the page now will cancel the upload." => "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。", "Invalid name, '/' is not allowed." => "無効な名前、'/' は使用できません。", @@ -35,6 +37,16 @@ "folders" => "フォルダ", "file" => "ファイル", "files" => "ファイル", +"seconds ago" => "秒前", +"minute ago" => "分前", +"minutes ago" => "分前", +"today" => "今日", +"yesterday" => "昨日", +"days ago" => "日前", +"last month" => "一月前", +"months ago" => "月前", +"last year" => "一年前", +"years ago" => "年前", "File handling" => "ファイル操作", "Maximum upload size" => "最大アップロードサイズ", "max. possible: " => "最大容量: ", diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php index 60c40f6d485..f2ea43ae81e 100644 --- a/apps/files/l10n/zh_CN.php +++ b/apps/files/l10n/zh_CN.php @@ -23,6 +23,8 @@ "Unable to upload your file as it is a directory or has 0 bytes" => "无法上传文件，因为它是一个目录或者大小为 0 字节", "Upload Error" => "上传错误", "Pending" => "操作等待中", +"1 file uploading" => "1个文件上传中", +"files uploading" => "文件上传中", "Upload cancelled." => "上传已取消", "File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传中。现在离开此页会导致上传动作被取消。", "Invalid name, '/' is not allowed." => "非法的名称，不允许使用‘/’。", @@ -35,6 +37,16 @@ "folders" => "文件夹", "file" => "文件", "files" => "文件", +"seconds ago" => "几秒前", +"minute ago" => "1分钟前", +"minutes ago" => "分钟前", +"today" => "今天", +"yesterday" => "昨天", +"days ago" => "%d 天前", +"last month" => "上月", +"months ago" => "月前", +"last year" => "上年", +"years ago" => "几年前", "File handling" => "文件处理", "Maximum upload size" => "最大上传大小", "max. possible: " => "最大可能: ", diff --git a/apps/files_sharing/l10n/zh_CN.php b/apps/files_sharing/l10n/zh_CN.php new file mode 100644 index 00000000000..64e7af3e0cd --- /dev/null +++ b/apps/files_sharing/l10n/zh_CN.php @@ -0,0 +1,9 @@ + "密码", +"Submit" => "提交", +"%s shared the folder %s with you" => "%s与您共享了%s文件夹", +"%s shared the file %s with you" => "%s与您共享了%s文件", +"Download" => "下载", +"No preview available for" => "没有预览", +"web services under your control" => "您控制的web服务" +); diff --git a/core/l10n/de.php b/core/l10n/de.php index d252700df16..fddb6859912 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -22,7 +22,7 @@ "Ok" => "OK", "No categories selected for deletion." => "Es wurde keine Kategorien zum Löschen ausgewählt.", "Error" => "Fehler", -"Error while sharing" => "Fehler beim Teilen", +"Error while sharing" => "Fehler beim Freigeben", "Error while unsharing" => "Fehler beim Aufheben der Freigabe", "Error while changing permissions" => "Fehler beim Ändern der Rechte", "Shared with you and the group %s by %s" => "%s hat dies für dich und die Gruppe %s freigegeben.", @@ -44,16 +44,16 @@ "update" => "aktualisieren", "delete" => "löschen", "share" => "teilen", -"Password protected" => "Passwort geschützt", +"Password protected" => "Durch ein Passwort geschützt", "Error unsetting expiration date" => "Fehler beim entfernen des Ablaufdatums", "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums", "ownCloud password reset" => "ownCloud-Passwort zurücksetzen", "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}", -"You will receive a link to reset your password via Email." => "Sie erhalten einen Link, um Ihr Passwort per E-Mail zurückzusetzen.", +"You will receive a link to reset your password via Email." => "Du erhälst einen Link per E-Mail, um Dein Passwort zurückzusetzen.", "Requested" => "Angefragt", "Login failed!" => "Login fehlgeschlagen!", "Username" => "Benutzername", -"Request reset" => "Anfrage zurückgesetzt", +"Request reset" => "Beantrage Zurücksetzung", "Your password was reset" => "Ihr Passwort wurde zurückgesetzt.", "To login page" => "Zur Login-Seite", "New password" => "Neues Passwort", @@ -68,10 +68,10 @@ "Edit categories" => "Kategorien bearbeiten", "Add" => "Hinzufügen", "Create an admin account" => "Administrator-Konto anlegen", -"Advanced" => "Erweitert", +"Advanced" => "Fortgeschritten", "Data folder" => "Datenverzeichnis", "Configure the database" => "Datenbank einrichten", -"will be used" => "wird genutzt", +"will be used" => "wird verwendet", "Database user" => "Datenbank-Benutzer", "Database password" => "Datenbank-Passwort", "Database name" => "Datenbank-Name", @@ -83,7 +83,7 @@ "Lost your password?" => "Passwort vergessen?", "remember" => "merken", "Log in" => "Einloggen", -"You are logged out." => "Sie wurden abgemeldet.", +"You are logged out." => "Du wurdest abgemeldet.", "prev" => "Zurück", "next" => "Weiter" ); diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php index e563c09cf15..bd442ef4116 100644 --- a/core/l10n/ja_JP.php +++ b/core/l10n/ja_JP.php @@ -45,6 +45,7 @@ "delete" => "削除", "share" => "共有", "Password protected" => "パスワード保護", +"Error unsetting expiration date" => "有効期限の未設定エラー", "Error setting expiration date" => "有効期限の設定でエラー発生", "ownCloud password reset" => "ownCloudのパスワードをリセットします", "Use the following link to reset your password: {link}" => "パスワードをリセットするには次のリンクをクリックして下さい: {link}", diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php index b84519a5c06..47bda01ab54 100644 --- a/core/l10n/zh_CN.php +++ b/core/l10n/zh_CN.php @@ -15,13 +15,38 @@ "October" => "十月", "November" => "十一月", "December" => "十二月", +"Choose" => "选择(&C)...", "Cancel" => "取消", "No" => "否", "Yes" => "是", "Ok" => "好", "No categories selected for deletion." => "没有选择要删除的类别", "Error" => "错误", +"Error while sharing" => "共享时出错", +"Error while unsharing" => "取消共享时出错", +"Error while changing permissions" => "修改权限时出错", +"Shared with you and the group %s by %s" => "与你及%s组共享，共享人: %s", +"Shared with you by %s" => "共享人: %s", +"Share with" => "共享", +"Share with link" => "共享链接", +"Password protect" => "密码保护", "Password" => "密码", +"Set expiration date" => "设置过期日期", +"Expiration date" => "过期日期", +"Share via email: %s" => "发电子邮件分享: %s", +"No people found" => "未找到此人", +"Resharing is not allowed" => "不允许二次共享", +"Shared in %s with %s" => "在%s中与%s共享", +"Unshare" => "取消共享", +"can edit" => "可以修改", +"access control" => "访问控制", +"create" => "创建", +"update" => "更新", +"delete" => "删除", +"share" => "共享", +"Password protected" => "密码已受保护", +"Error unsetting expiration date" => "取消设置过期日期时出错", +"Error setting expiration date" => "设置过期日期时出错", "ownCloud password reset" => "重置 ownCloud 密码", "Use the following link to reset your password: {link}" => "使用以下链接重置您的密码：{link}", "You will receive a link to reset your password via Email." => "您将会收到包含可以重置密码链接的邮件。", diff --git a/l10n/de/core.po b/l10n/de/core.po index 7e0a3635c55..9305a60d07c 100644 --- a/l10n/de/core.po +++ b/l10n/de/core.po @@ -20,9 +20,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-27 02:01+0200\n" -"PO-Revision-Date: 2012-09-26 11:39+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-28 02:02+0200\n" +"PO-Revision-Date: 2012-09-27 22:12+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -125,7 +125,7 @@ msgstr "Fehler" #: js/share.js:103 msgid "Error while sharing" -msgstr "Fehler beim Teilen" +msgstr "Fehler beim Freigeben" #: js/share.js:114 msgid "Error while unsharing" @@ -217,7 +217,7 @@ msgstr "teilen" #: js/share.js:317 js/share.js:476 msgid "Password protected" -msgstr "Passwort geschützt" +msgstr "Durch ein Passwort geschützt" #: js/share.js:489 msgid "Error unsetting expiration date" @@ -237,7 +237,7 @@ msgstr "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {lin #: lostpassword/templates/lostpassword.php:3 msgid "You will receive a link to reset your password via Email." -msgstr "Sie erhalten einen Link, um Ihr Passwort per E-Mail zurückzusetzen." +msgstr "Du erhälst einen Link per E-Mail, um Dein Passwort zurückzusetzen." #: lostpassword/templates/lostpassword.php:5 msgid "Requested" @@ -254,7 +254,7 @@ msgstr "Benutzername" #: lostpassword/templates/lostpassword.php:15 msgid "Request reset" -msgstr "Anfrage zurückgesetzt" +msgstr "Beantrage Zurücksetzung" #: lostpassword/templates/resetpassword.php:4 msgid "Your password was reset" @@ -314,7 +314,7 @@ msgstr "Administrator-Konto anlegen" #: templates/installation.php:36 msgid "Advanced" -msgstr "Erweitert" +msgstr "Fortgeschritten" #: templates/installation.php:38 msgid "Data folder" @@ -327,7 +327,7 @@ msgstr "Datenbank einrichten" #: templates/installation.php:50 templates/installation.php:61 #: templates/installation.php:71 templates/installation.php:81 msgid "will be used" -msgstr "wird genutzt" +msgstr "wird verwendet" #: templates/installation.php:93 msgid "Database user" @@ -375,7 +375,7 @@ msgstr "Einloggen" #: templates/logout.php:1 msgid "You are logged out." -msgstr "Sie wurden abgemeldet." +msgstr "Du wurdest abgemeldet." #: templates/part.pagenavi.php:3 msgid "prev" diff --git a/l10n/de/files.po b/l10n/de/files.po index 111dacc2d9f..e2635a4a0b1 100644 --- a/l10n/de/files.po +++ b/l10n/de/files.po @@ -4,6 +4,7 @@ # # Translators: # , 2012. +# , 2012. # I Robot , 2012. # Jan-Christoph Borchardt , 2011. # Jan-Christoph Borchardt , 2011. @@ -21,9 +22,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-27 02:01+0200\n" -"PO-Revision-Date: 2012-09-26 11:49+0000\n" -"Last-Translator: JamFX \n" +"POT-Creation-Date: 2012-09-28 02:02+0200\n" +"PO-Revision-Date: 2012-09-27 22:31+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -67,7 +68,7 @@ msgstr "Dateien" #: js/fileactions.js:108 templates/index.php:62 msgid "Unshare" -msgstr "Nicht mehr teilen" +msgstr "Nicht mehr freigeben" #: js/fileactions.js:110 templates/index.php:64 msgid "Delete" @@ -107,7 +108,7 @@ msgstr "mit" #: js/filelist.js:273 msgid "unshared" -msgstr "Nicht mehr teilen" +msgstr "Nicht mehr freigegeben" #: js/filelist.js:275 msgid "deleted" @@ -119,11 +120,11 @@ msgstr "Erstelle ZIP-Datei. Dies kann eine Weile dauern." #: js/files.js:208 msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis ist oder 0 Bytes hat." +msgstr "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist." #: js/files.js:208 msgid "Upload Error" -msgstr "Fehler beim Hochladen" +msgstr "Fehler beim Upload" #: js/files.js:236 js/files.js:341 js/files.js:371 msgid "Pending" @@ -139,7 +140,7 @@ msgstr "Dateien werden hoch geladen" #: js/files.js:322 js/files.js:355 msgid "Upload cancelled." -msgstr "Hochladen abgebrochen." +msgstr "Upload abgebrochen." #: js/files.js:424 msgid "" @@ -272,7 +273,7 @@ msgstr "Ordner" #: templates/index.php:11 msgid "From url" -msgstr "URL" +msgstr "Von einer URL" #: templates/index.php:20 msgid "Upload" diff --git a/l10n/de/lib.po b/l10n/de/lib.po index e066695345d..d1d17eec25b 100644 --- a/l10n/de/lib.po +++ b/l10n/de/lib.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. # Phi Lieb <>, 2012. # , 2012. # , 2012. @@ -10,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-18 02:01+0200\n" -"PO-Revision-Date: 2012-09-17 21:03+0000\n" -"Last-Translator: traductor \n" +"POT-Creation-Date: 2012-09-28 02:03+0200\n" +"PO-Revision-Date: 2012-09-27 22:40+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,19 +45,19 @@ msgstr "Apps" msgid "Admin" msgstr "Administrator" -#: files.php:280 +#: files.php:327 msgid "ZIP download is turned off." msgstr "Der ZIP-Download ist deaktiviert." -#: files.php:281 +#: files.php:328 msgid "Files need to be downloaded one by one." msgstr "Die Dateien müssen einzeln heruntergeladen werden." -#: files.php:281 files.php:306 +#: files.php:328 files.php:353 msgid "Back to Files" msgstr "Zurück zu \"Dateien\"" -#: files.php:305 +#: files.php:352 msgid "Selected files too large to generate zip file." msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen." @@ -70,7 +71,7 @@ msgstr "Authentifizierungs-Fehler" #: json.php:51 msgid "Token expired. Please reload page." -msgstr "Token abgelaufen. Bitte laden Sie die Seite neu." +msgstr "Token abgelaufen. Bitte lade die Seite neu." #: template.php:87 msgid "seconds ago" @@ -83,7 +84,7 @@ msgstr "Vor einer Minute" #: template.php:89 #, php-format msgid "%d minutes ago" -msgstr "Vor %d Minute(n)" +msgstr "Vor %d Minuten" #: template.php:92 msgid "today" diff --git a/l10n/de/settings.po b/l10n/de/settings.po index b600de48c54..ca3901fa0c9 100644 --- a/l10n/de/settings.po +++ b/l10n/de/settings.po @@ -4,6 +4,7 @@ # # Translators: # , 2011, 2012. +# , 2012. # , 2012. # I Robot , 2012. # Jan-Christoph Borchardt , 2011. @@ -20,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-24 02:02+0200\n" -"PO-Revision-Date: 2012-09-23 21:04+0000\n" -"Last-Translator: AnybodyElse \n" +"POT-Creation-Date: 2012-09-28 02:03+0200\n" +"PO-Revision-Date: 2012-09-27 22:24+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,12 +33,12 @@ msgstr "" #: ajax/apps/ocs.php:23 msgid "Unable to load list from App Store" -msgstr "Die Liste der Apps im Store konnte nicht geladen werden." +msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden." #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18 #: ajax/togglegroups.php:15 msgid "Authentication error" -msgstr "Anmeldungsfehler" +msgstr "Fehler bei der Anmeldung" #: ajax/creategroup.php:19 msgid "Group already exists" @@ -53,11 +54,11 @@ msgstr "App konnte nicht aktiviert werden." #: ajax/lostpassword.php:14 msgid "Email saved" -msgstr "E-Mail gespeichert" +msgstr "E-Mail Adresse gespeichert" #: ajax/lostpassword.php:16 msgid "Invalid email" -msgstr "Ungültige E-Mail" +msgstr "Ungültige E-Mail Adresse" #: ajax/openid.php:16 msgid "OpenID Changed" @@ -120,23 +121,23 @@ msgstr "Ihr Datenverzeichnis ist möglicher Weise aus dem Internet erreichbar. D #: templates/admin.php:31 msgid "Cron" -msgstr "Cron" +msgstr "Cron-Jobs" #: templates/admin.php:37 msgid "Execute one task with each page loaded" -msgstr "Führe eine Aufgabe pro geladener Seite aus." +msgstr "Führe eine Aufgabe bei jeder geladenen Seite aus." #: templates/admin.php:43 msgid "" "cron.php is registered at a webcron service. Call the cron.php page in the " "owncloud root once a minute over http." -msgstr "cron.php ist bei einem Webcron-Dienst registriert. Rufen Sie die Seite cron.php im ownCloud-Root minütlich per HTTP auf." +msgstr "cron.php ist bei einem Webcron-Dienst registriert. Ruf die Seite cron.php im ownCloud-Root minütlich per HTTP auf." #: templates/admin.php:49 msgid "" "Use systems cron service. Call the cron.php file in the owncloud folder via " "a system cronjob once a minute." -msgstr "Benutzen Sie den System-Crondienst. Rufen Sie die cron.php im ownCloud-Ordner über einen System-Cronjob minütlich auf." +msgstr "Benutze den System-Crondienst. Bitte ruf die cron.php im ownCloud-Ordner über einen System-Cronjob minütlich auf." #: templates/admin.php:56 msgid "Sharing" @@ -144,11 +145,11 @@ msgstr "Freigabe" #: templates/admin.php:61 msgid "Enable Share API" -msgstr "Teilungs-API aktivieren" +msgstr "Freigabe-API aktivieren" #: templates/admin.php:62 msgid "Allow apps to use the Share API" -msgstr "Erlaubt Nutzern, die Teilungs-API zu nutzen" +msgstr "Erlaubt Anwendungen, die Freigabe-API zu nutzen" #: templates/admin.php:67 msgid "Allow links" @@ -156,7 +157,7 @@ msgstr "Links erlauben" #: templates/admin.php:68 msgid "Allow users to share items to the public with links" -msgstr "Erlaube Nutzern, Dateien mithilfe von Links mit der Öffentlichkeit zu teilen" +msgstr "Erlaube Nutzern, Dateien mithilfe von Links öffentlich zu teilen" #: templates/admin.php:73 msgid "Allow resharing" @@ -168,11 +169,11 @@ msgstr "Erlaubt Nutzern, Dateien die mit ihnen geteilt wurden, erneut zu teilen" #: templates/admin.php:79 msgid "Allow users to share with anyone" -msgstr "Erlaube Nutzern mit jedem zu Teilen" +msgstr "Erlaubet Nutzern mit jedem zu Teilen" #: templates/admin.php:81 msgid "Allow users to only share with users in their groups" -msgstr "Erlaube Nutzern nur das Teilen in ihrer Gruppe" +msgstr "Erlaubet Nutzern nur das Teilen in ihrer Gruppe" #: templates/admin.php:88 msgid "Log" @@ -194,15 +195,15 @@ msgstr "Entwickelt von der -licensed by " @@ -218,7 +219,7 @@ msgstr "Große Dateien verwalten" #: templates/help.php:11 msgid "Ask a question" -msgstr "Stellen Sie eine Frage" +msgstr "Stelle eine Frage" #: templates/help.php:23 msgid "Problems connecting to help database." @@ -235,7 +236,7 @@ msgstr "Antwort" #: templates/personal.php:8 #, php-format msgid "You have used %s of the available %s" -msgstr "Sie verwenden %s der verfügbaren %s" +msgstr "Du verwendest %s der verfügbaren %s" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" @@ -247,7 +248,7 @@ msgstr "Download" #: templates/personal.php:19 msgid "Your password was changed" -msgstr "Ihr Passwort wurde geändert." +msgstr "Dein Passwort wurde geändert." #: templates/personal.php:20 msgid "Unable to change your password" @@ -275,11 +276,11 @@ msgstr "E-Mail" #: templates/personal.php:31 msgid "Your email address" -msgstr "Ihre E-Mail-Adresse" +msgstr "Deine E-Mail-Adresse" #: templates/personal.php:32 msgid "Fill in an email address to enable password recovery" -msgstr "Tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren." +msgstr "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren." #: templates/personal.php:38 templates/personal.php:39 msgid "Language" @@ -287,7 +288,7 @@ msgstr "Sprache" #: templates/personal.php:44 msgid "Help translate" -msgstr "Helfen Sie bei der Übersetzung" +msgstr "Hilf bei der Übersetzung" #: templates/personal.php:51 msgid "use this address to connect to your ownCloud in your file manager" diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po index 6c588ebd9e5..8a0aa16cedb 100644 --- a/l10n/ja_JP/core.po +++ b/l10n/ja_JP/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-09-26 13:19+0200\n" -"PO-Revision-Date: 2012-09-26 11:19+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-28 02:02+0200\n" +"PO-Revision-Date: 2012-09-27 00:52+0000\n" +"Last-Translator: Daisuke Deguchi \n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -210,7 +210,7 @@ msgstr "パスワード保護" #: js/share.js:489 msgid "Error unsetting expiration date" -msgstr "" +msgstr "有効期限の未設定エラー" #: js/share.js:501 msgid "Error setting expiration date" diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po index 906b8008947..786548648ce 100644 --- a/l10n/ja_JP/files.po +++ b/l10n/ja_JP/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-09-26 13:19+0200\n" -"PO-Revision-Date: 2012-09-26 11:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-28 02:02+0200\n" +"PO-Revision-Date: 2012-09-27 00:51+0000\n" +"Last-Translator: Daisuke Deguchi \n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -119,11 +119,11 @@ msgstr "保留" #: js/files.js:256 msgid "1 file uploading" -msgstr "" +msgstr "ファイルを1つアップロード中" #: js/files.js:259 js/files.js:304 js/files.js:319 msgid "files uploading" -msgstr "" +msgstr "ファイルをアップロード中" #: js/files.js:322 js/files.js:355 msgid "Upload cancelled." @@ -138,81 +138,81 @@ msgstr "ファイル転送を実行中です。今このページから移動す msgid "Invalid name, '/' is not allowed." msgstr "無効な名前、'/' は使用できません。" -#: js/files.js:667 +#: js/files.js:668 msgid "files scanned" msgstr "ファイルをスキャンしました" -#: js/files.js:675 +#: js/files.js:676 msgid "error while scanning" msgstr "スキャン中のエラー" -#: js/files.js:748 templates/index.php:48 +#: js/files.js:749 templates/index.php:48 msgid "Name" msgstr "名前" -#: js/files.js:749 templates/index.php:56 +#: js/files.js:750 templates/index.php:56 msgid "Size" msgstr "サイズ" -#: js/files.js:750 templates/index.php:58 +#: js/files.js:751 templates/index.php:58 msgid "Modified" msgstr "更新日時" -#: js/files.js:777 +#: js/files.js:778 msgid "folder" msgstr "フォルダ" -#: js/files.js:779 +#: js/files.js:780 msgid "folders" msgstr "フォルダ" -#: js/files.js:787 +#: js/files.js:788 msgid "file" msgstr "ファイル" -#: js/files.js:789 +#: js/files.js:790 msgid "files" msgstr "ファイル" -#: js/files.js:833 -msgid "seconds ago" -msgstr "" - #: js/files.js:834 -msgid "minute ago" -msgstr "" +msgid "seconds ago" +msgstr "秒前" #: js/files.js:835 -msgid "minutes ago" -msgstr "" +msgid "minute ago" +msgstr "分前" -#: js/files.js:838 -msgid "today" -msgstr "" +#: js/files.js:836 +msgid "minutes ago" +msgstr "分前" #: js/files.js:839 -msgid "yesterday" -msgstr "" +msgid "today" +msgstr "今日" #: js/files.js:840 -msgid "days ago" -msgstr "" +msgid "yesterday" +msgstr "昨日" #: js/files.js:841 -msgid "last month" -msgstr "" +msgid "days ago" +msgstr "日前" -#: js/files.js:843 -msgid "months ago" -msgstr "" +#: js/files.js:842 +msgid "last month" +msgstr "一月前" #: js/files.js:844 -msgid "last year" -msgstr "" +msgid "months ago" +msgstr "月前" #: js/files.js:845 +msgid "last year" +msgstr "一年前" + +#: js/files.js:846 msgid "years ago" -msgstr "" +msgstr "年前" #: templates/admin.php:5 msgid "File handling" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 3dd88c79dbf..861fe878993 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-09-27 02:01+0200\n" +"POT-Creation-Date: 2012-09-28 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index c59c25fdcb3..80c1c196e3f 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-09-27 02:01+0200\n" +"POT-Creation-Date: 2012-09-28 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 36387a9288c..00d37e9b4e7 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-09-27 02:01+0200\n" +"POT-Creation-Date: 2012-09-28 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 286aaaaaa1c..fb569b41bf4 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-09-27 02:01+0200\n" +"POT-Creation-Date: 2012-09-28 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 9b14cb91822..7e598348e25 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-09-27 02:01+0200\n" +"POT-Creation-Date: 2012-09-28 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index c844a192b32..0261cee06a9 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-09-27 02:01+0200\n" +"POT-Creation-Date: 2012-09-28 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 1b312f927cd..91d014d024b 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-09-27 02:01+0200\n" +"POT-Creation-Date: 2012-09-28 02:03+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 1ce4f67633e..67eb87cfcd7 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-09-27 02:01+0200\n" +"POT-Creation-Date: 2012-09-28 02:03+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 805cd0c4df8..ed8c48f3cec 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-09-27 02:01+0200\n" +"POT-Creation-Date: 2012-09-28 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po index 50fafe5cc6f..e03aa1d5d4d 100644 --- a/l10n/zh_CN/core.po +++ b/l10n/zh_CN/core.po @@ -5,14 +5,15 @@ # Translators: # , 2012. # Phoenix Nemo <>, 2012. +# , 2012. # , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-26 13:19+0200\n" -"PO-Revision-Date: 2012-09-26 11:19+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-28 02:02+0200\n" +"PO-Revision-Date: 2012-09-27 14:37+0000\n" +"Last-Translator: waterone \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" @@ -86,7 +87,7 @@ msgstr "十二月" #: js/oc-dialogs.js:123 msgid "Choose" -msgstr "" +msgstr "选择(&C)..." #: js/oc-dialogs.js:143 js/oc-dialogs.js:163 msgid "Cancel" @@ -115,37 +116,37 @@ msgstr "错误" #: js/share.js:103 msgid "Error while sharing" -msgstr "" +msgstr "共享时出错" #: js/share.js:114 msgid "Error while unsharing" -msgstr "" +msgstr "取消共享时出错" #: js/share.js:121 msgid "Error while changing permissions" -msgstr "" +msgstr "修改权限时出错" #: js/share.js:130 #, python-format msgid "Shared with you and the group %s by %s" -msgstr "" +msgstr "与你及%s组共享，共享人: %s" #: js/share.js:132 #, python-format msgid "Shared with you by %s" -msgstr "" +msgstr "共享人: %s" #: js/share.js:137 msgid "Share with" -msgstr "" +msgstr "共享" #: js/share.js:142 msgid "Share with link" -msgstr "" +msgstr "共享链接" #: js/share.js:143 msgid "Password protect" -msgstr "" +msgstr "密码保护" #: js/share.js:147 templates/installation.php:30 templates/login.php:13 msgid "Password" @@ -153,69 +154,69 @@ msgstr "密码" #: js/share.js:152 msgid "Set expiration date" -msgstr "" +msgstr "设置过期日期" #: js/share.js:153 msgid "Expiration date" -msgstr "" +msgstr "过期日期" #: js/share.js:185 #, python-format msgid "Share via email: %s" -msgstr "" +msgstr "发电子邮件分享: %s" #: js/share.js:187 msgid "No people found" -msgstr "" +msgstr "未找到此人" #: js/share.js:214 msgid "Resharing is not allowed" -msgstr "" +msgstr "不允许二次共享" #: js/share.js:250 #, python-format msgid "Shared in %s with %s" -msgstr "" +msgstr "在%s中与%s共享" #: js/share.js:271 msgid "Unshare" -msgstr "" +msgstr "取消共享" #: js/share.js:279 msgid "can edit" -msgstr "" +msgstr "可以修改" #: js/share.js:281 msgid "access control" -msgstr "" +msgstr "访问控制" #: js/share.js:284 msgid "create" -msgstr "" +msgstr "创建" #: js/share.js:287 msgid "update" -msgstr "" +msgstr "更新" #: js/share.js:290 msgid "delete" -msgstr "" +msgstr "删除" #: js/share.js:293 msgid "share" -msgstr "" +msgstr "共享" #: js/share.js:317 js/share.js:476 msgid "Password protected" -msgstr "" +msgstr "密码已受保护" #: js/share.js:489 msgid "Error unsetting expiration date" -msgstr "" +msgstr "取消设置过期日期时出错" #: js/share.js:501 msgid "Error setting expiration date" -msgstr "" +msgstr "设置过期日期时出错" #: lostpassword/index.php:26 msgid "ownCloud password reset" diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po index 4eac1099c91..f6d9aa43f8e 100644 --- a/l10n/zh_CN/files.po +++ b/l10n/zh_CN/files.po @@ -5,14 +5,15 @@ # Translators: # , 2012. # , 2012. +# , 2012. # , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\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 \n" +"POT-Creation-Date: 2012-09-28 02:02+0200\n" +"PO-Revision-Date: 2012-09-27 14:26+0000\n" +"Last-Translator: waterone \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" @@ -120,11 +121,11 @@ msgstr "操作等待中" #: js/files.js:256 msgid "1 file uploading" -msgstr "" +msgstr "1个文件上传中" #: js/files.js:259 js/files.js:304 js/files.js:319 msgid "files uploading" -msgstr "" +msgstr "文件上传中" #: js/files.js:322 js/files.js:355 msgid "Upload cancelled." @@ -139,81 +140,81 @@ msgstr "文件正在上传中。现在离开此页会导致上传动作被取消 msgid "Invalid name, '/' is not allowed." msgstr "非法的名称，不允许使用‘/’。" -#: js/files.js:667 +#: js/files.js:668 msgid "files scanned" msgstr "已扫描文件" -#: js/files.js:675 +#: js/files.js:676 msgid "error while scanning" msgstr "扫描时出错" -#: js/files.js:748 templates/index.php:48 +#: js/files.js:749 templates/index.php:48 msgid "Name" msgstr "名称" -#: js/files.js:749 templates/index.php:56 +#: js/files.js:750 templates/index.php:56 msgid "Size" msgstr "大小" -#: js/files.js:750 templates/index.php:58 +#: js/files.js:751 templates/index.php:58 msgid "Modified" msgstr "修改日期" -#: js/files.js:777 +#: js/files.js:778 msgid "folder" msgstr "文件夹" -#: js/files.js:779 +#: js/files.js:780 msgid "folders" msgstr "文件夹" -#: js/files.js:787 +#: js/files.js:788 msgid "file" msgstr "文件" -#: js/files.js:789 +#: js/files.js:790 msgid "files" msgstr "文件" -#: js/files.js:833 -msgid "seconds ago" -msgstr "" - #: js/files.js:834 -msgid "minute ago" -msgstr "" +msgid "seconds ago" +msgstr "几秒前" #: js/files.js:835 -msgid "minutes ago" -msgstr "" +msgid "minute ago" +msgstr "1分钟前" -#: js/files.js:838 -msgid "today" -msgstr "" +#: js/files.js:836 +msgid "minutes ago" +msgstr "分钟前" #: js/files.js:839 -msgid "yesterday" -msgstr "" +msgid "today" +msgstr "今天" #: js/files.js:840 -msgid "days ago" -msgstr "" +msgid "yesterday" +msgstr "昨天" #: js/files.js:841 -msgid "last month" -msgstr "" +msgid "days ago" +msgstr "%d 天前" -#: js/files.js:843 -msgid "months ago" -msgstr "" +#: js/files.js:842 +msgid "last month" +msgstr "上月" #: js/files.js:844 -msgid "last year" -msgstr "" +msgid "months ago" +msgstr "月前" #: js/files.js:845 +msgid "last year" +msgstr "上年" + +#: js/files.js:846 msgid "years ago" -msgstr "" +msgstr "几年前" #: templates/admin.php:5 msgid "File handling" diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po index 0cf69de8ed6..149353d1100 100644 --- a/l10n/zh_CN/files_sharing.po +++ b/l10n/zh_CN/files_sharing.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-22 01:14+0200\n" -"PO-Revision-Date: 2012-09-21 23:15+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-28 02:02+0200\n" +"PO-Revision-Date: 2012-09-27 14:41+0000\n" +"Last-Translator: waterone \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" @@ -19,30 +20,30 @@ msgstr "" #: templates/authenticate.php:4 msgid "Password" -msgstr "" +msgstr "密码" #: templates/authenticate.php:6 msgid "Submit" -msgstr "" +msgstr "提交" #: templates/public.php:9 #, php-format msgid "%s shared the folder %s with you" -msgstr "" +msgstr "%s与您共享了%s文件夹" #: templates/public.php:11 #, php-format msgid "%s shared the file %s with you" -msgstr "" +msgstr "%s与您共享了%s文件" #: templates/public.php:14 templates/public.php:30 msgid "Download" -msgstr "" +msgstr "下载" #: templates/public.php:29 msgid "No preview available for" -msgstr "" +msgstr "没有预览" #: templates/public.php:37 msgid "web services under your control" -msgstr "" +msgstr "您控制的web服务" diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po index defda5f688f..a0bc33f6106 100644 --- a/l10n/zh_CN/settings.po +++ b/l10n/zh_CN/settings.po @@ -6,14 +6,15 @@ # , 2012. # Phoenix Nemo <>, 2012. # , 2012. +# , 2012. # , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" -"PO-Revision-Date: 2012-09-19 00:03+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-28 02:03+0200\n" +"PO-Revision-Date: 2012-09-27 14:13+0000\n" +"Last-Translator: waterone \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" @@ -32,11 +33,11 @@ msgstr "认证错误" #: ajax/creategroup.php:19 msgid "Group already exists" -msgstr "已存在组" +msgstr "已存在该组" #: ajax/creategroup.php:28 msgid "Unable to add group" -msgstr "不能添加组" +msgstr "无法添加组" #: ajax/enableapp.php:14 msgid "Could not enable app. " @@ -60,11 +61,11 @@ msgstr "非法请求" #: ajax/removegroup.php:16 msgid "Unable to delete group" -msgstr "不能删除组" +msgstr "无法删除组" #: ajax/removeuser.php:22 msgid "Unable to delete user" -msgstr "不能删除用户" +msgstr "无法删除用户" #: ajax/setlanguage.php:18 msgid "Language changed" @@ -73,12 +74,12 @@ msgstr "语言已修改" #: ajax/togglegroups.php:25 #, php-format msgid "Unable to add user to group %s" -msgstr "不能把用户添加到组 %s" +msgstr "无法把用户添加到组 %s" #: ajax/togglegroups.php:31 #, php-format msgid "Unable to remove user from group %s" -msgstr "不能从组%s中移除用户" +msgstr "无法从组%s中移除用户" #: js/apps.js:27 js/apps.js:61 msgid "Disable" @@ -107,7 +108,7 @@ msgid "" "strongly suggest that you configure your webserver in a way that the data " "directory is no longer accessible or you move the data directory outside the" " webserver document root." -msgstr "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。" +msgstr "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器根目录以外。" #: templates/admin.php:31 msgid "Cron" @@ -226,7 +227,7 @@ msgstr "回答" #: templates/personal.php:8 #, php-format msgid "You have used %s of the available %s" -msgstr "" +msgstr "您已使用空间: %s，总空间: %s" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" @@ -238,7 +239,7 @@ msgstr "下载" #: templates/personal.php:19 msgid "Your password was changed" -msgstr "" +msgstr "密码已修改" #: templates/personal.php:20 msgid "Unable to change your password" @@ -282,7 +283,7 @@ msgstr "帮助翻译" #: templates/personal.php:51 msgid "use this address to connect to your ownCloud in your file manager" -msgstr "在文件管理器中使用这个地址来连接到您的 ownCloud" +msgstr "您可在文件管理器中使用该地址连接到ownCloud" #: templates/users.php:21 templates/users.php:76 msgid "Name" diff --git a/lib/l10n/de.php b/lib/l10n/de.php index aea631aba28..8c81be16582 100644 --- a/lib/l10n/de.php +++ b/lib/l10n/de.php @@ -11,10 +11,10 @@ "Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen.", "Application is not enabled" => "Die Anwendung ist nicht aktiviert", "Authentication error" => "Authentifizierungs-Fehler", -"Token expired. Please reload page." => "Token abgelaufen. Bitte laden Sie die Seite neu.", +"Token expired. Please reload page." => "Token abgelaufen. Bitte lade die Seite neu.", "seconds ago" => "Vor wenigen Sekunden", "1 minute ago" => "Vor einer Minute", -"%d minutes ago" => "Vor %d Minute(n)", +"%d minutes ago" => "Vor %d Minuten", "today" => "Heute", "yesterday" => "Gestern", "%d days ago" => "Vor %d Tag(en)", diff --git a/settings/l10n/de.php b/settings/l10n/de.php index 9c034fc2546..6b86a08ced5 100644 --- a/settings/l10n/de.php +++ b/settings/l10n/de.php @@ -1,11 +1,11 @@ "Die Liste der Apps im Store konnte nicht geladen werden.", -"Authentication error" => "Anmeldungsfehler", +"Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.", +"Authentication error" => "Fehler bei der Anmeldung", "Group already exists" => "Gruppe existiert bereits", "Unable to add group" => "Gruppe konnte nicht angelegt werden", "Could not enable app. " => "App konnte nicht aktiviert werden.", -"Email saved" => "E-Mail gespeichert", -"Invalid email" => "Ungültige E-Mail", +"Email saved" => "E-Mail Adresse gespeichert", +"Invalid email" => "Ungültige E-Mail Adresse", "OpenID Changed" => "OpenID geändert", "Invalid request" => "Ungültige Anfrage", "Unable to delete group" => "Gruppe konnte nicht gelöscht werden", @@ -19,46 +19,46 @@ "__language_name__" => "Deutsch", "Security Warning" => "Sicherheitshinweis", "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ihr Datenverzeichnis ist möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei von ownCloud funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.", -"Cron" => "Cron", -"Execute one task with each page loaded" => "Führe eine Aufgabe pro geladener Seite aus.", -"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ist bei einem Webcron-Dienst registriert. Rufen Sie die Seite cron.php im ownCloud-Root minütlich per HTTP auf.", -"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Benutzen Sie den System-Crondienst. Rufen Sie die cron.php im ownCloud-Ordner über einen System-Cronjob minütlich auf.", +"Cron" => "Cron-Jobs", +"Execute one task with each page loaded" => "Führe eine Aufgabe bei jeder geladenen Seite aus.", +"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ist bei einem Webcron-Dienst registriert. Ruf die Seite cron.php im ownCloud-Root minütlich per HTTP auf.", +"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Benutze den System-Crondienst. Bitte ruf die cron.php im ownCloud-Ordner über einen System-Cronjob minütlich auf.", "Sharing" => "Freigabe", -"Enable Share API" => "Teilungs-API aktivieren", -"Allow apps to use the Share API" => "Erlaubt Nutzern, die Teilungs-API zu nutzen", +"Enable Share API" => "Freigabe-API aktivieren", +"Allow apps to use the Share API" => "Erlaubt Anwendungen, die Freigabe-API zu nutzen", "Allow links" => "Links erlauben", -"Allow users to share items to the public with links" => "Erlaube Nutzern, Dateien mithilfe von Links mit der Öffentlichkeit zu teilen", +"Allow users to share items to the public with links" => "Erlaube Nutzern, Dateien mithilfe von Links öffentlich zu teilen", "Allow resharing" => "Erneutes Teilen erlauben", "Allow users to share items shared with them again" => "Erlaubt Nutzern, Dateien die mit ihnen geteilt wurden, erneut zu teilen", -"Allow users to share with anyone" => "Erlaube Nutzern mit jedem zu Teilen", -"Allow users to only share with users in their groups" => "Erlaube Nutzern nur das Teilen in ihrer Gruppe", +"Allow users to share with anyone" => "Erlaubet Nutzern mit jedem zu Teilen", +"Allow users to only share with users in their groups" => "Erlaubet Nutzern nur das Teilen in ihrer Gruppe", "Log" => "Log", "More" => "Mehr", "Developed by the ownCloud community, the source code is licensed under the AGPL." => "Entwickelt von der ownCloud-Community, der Quellcode ist unter der AGPL lizenziert.", -"Add your App" => "Fügen Sie Ihre App hinzu", -"Select an App" => "Wählen Sie eine Anwendung aus", -"See application page at apps.owncloud.com" => "Weitere Anwendungen finden Sie auf apps.owncloud.com", +"Add your App" => "Füge Deine Anwendung hinzu", +"Select an App" => "Wähle eine Anwendung aus", +"See application page at apps.owncloud.com" => "Weitere Anwendungen findest Du auf apps.owncloud.com", "-licensed by " => "-lizenziert von ", "Documentation" => "Dokumentation", "Managing Big Files" => "Große Dateien verwalten", -"Ask a question" => "Stellen Sie eine Frage", +"Ask a question" => "Stelle eine Frage", "Problems connecting to help database." => "Probleme bei der Verbindung zur Hilfe-Datenbank.", "Go there manually." => "Datenbank direkt besuchen.", "Answer" => "Antwort", -"You have used %s of the available %s" => "Sie verwenden %s der verfügbaren %s", +"You have used %s of the available %s" => "Du verwendest %s der verfügbaren %s", "Desktop and Mobile Syncing Clients" => "Desktop- und mobile Clients für die Synchronisation", "Download" => "Download", -"Your password was changed" => "Ihr Passwort wurde geändert.", +"Your password was changed" => "Dein Passwort wurde geändert.", "Unable to change your password" => "Passwort konnte nicht geändert werden", "Current password" => "Aktuelles Passwort", "New password" => "Neues Passwort", "show" => "zeigen", "Change password" => "Passwort ändern", "Email" => "E-Mail", -"Your email address" => "Ihre E-Mail-Adresse", -"Fill in an email address to enable password recovery" => "Tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.", +"Your email address" => "Deine E-Mail-Adresse", +"Fill in an email address to enable password recovery" => "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.", "Language" => "Sprache", -"Help translate" => "Helfen Sie bei der Übersetzung", +"Help translate" => "Hilf bei der Übersetzung", "use this address to connect to your ownCloud in your file manager" => "Benutzen Sie diese Adresse, um Ihre ownCloud mit Ihrem Dateimanager zu verbinden.", "Name" => "Name", "Password" => "Passwort", diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php index 41f22776885..31063d3a01b 100644 --- a/settings/l10n/zh_CN.php +++ b/settings/l10n/zh_CN.php @@ -1,24 +1,24 @@ "无法从应用商店载入列表", "Authentication error" => "认证错误", -"Group already exists" => "已存在组", -"Unable to add group" => "不能添加组", +"Group already exists" => "已存在该组", +"Unable to add group" => "无法添加组", "Could not enable app. " => "无法开启App", "Email saved" => "电子邮件已保存", "Invalid email" => "无效的电子邮件", "OpenID Changed" => "OpenID 已修改", "Invalid request" => "非法请求", -"Unable to delete group" => "不能删除组", -"Unable to delete user" => "不能删除用户", +"Unable to delete group" => "无法删除组", +"Unable to delete user" => "无法删除用户", "Language changed" => "语言已修改", -"Unable to add user to group %s" => "不能把用户添加到组 %s", -"Unable to remove user from group %s" => "不能从组%s中移除用户", +"Unable to add user to group %s" => "无法把用户添加到组 %s", +"Unable to remove user from group %s" => "无法从组%s中移除用户", "Disable" => "禁用", "Enable" => "启用", "Saving..." => "正在保存", "__language_name__" => "简体中文", "Security Warning" => "安全警告", -"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。", +"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器根目录以外。", "Cron" => "计划任务", "Execute one task with each page loaded" => "每次页面加载完成后执行任务", "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php已被注册到网络定时任务服务。通过http每分钟调用owncloud根目录的cron.php网页。", @@ -45,8 +45,10 @@ "Problems connecting to help database." => "连接帮助数据库错误 ", "Go there manually." => "手动访问", "Answer" => "回答", +"You have used %s of the available %s" => "您已使用空间: %s，总空间: %s", "Desktop and Mobile Syncing Clients" => "桌面和移动设备同步程序", "Download" => "下载", +"Your password was changed" => "密码已修改", "Unable to change your password" => "无法修改密码", "Current password" => "当前密码", "New password" => "新密码", @@ -57,7 +59,7 @@ "Fill in an email address to enable password recovery" => "填写电子邮件地址以启用密码恢复", "Language" => "语言", "Help translate" => "帮助翻译", -"use this address to connect to your ownCloud in your file manager" => "在文件管理器中使用这个地址来连接到您的 ownCloud", +"use this address to connect to your ownCloud in your file manager" => "您可在文件管理器中使用该地址连接到ownCloud", "Name" => "名称", "Password" => "密码", "Groups" => "组", From 743826bbf34b82b92371cf7e9b0478897188c046 Mon Sep 17 00:00:00 2001 From: Christian Reiner Date: Fri, 28 Sep 2012 13:30:44 +0200 Subject: [PATCH 11/42] Reimplementation of CSRF protection including autorefresh --- core/ajax/requesttoken.php | 41 +++++++++++++++++++++++++ core/js/eventsource.js | 2 +- core/js/requesttoken.js | 55 ++++++++++++++++++++++++++++++++++ core/templates/layout.user.php | 9 ++---- lib/base.php | 2 ++ lib/template.php | 6 ---- lib/util.php | 36 +++++++++++++++------- 7 files changed, 127 insertions(+), 24 deletions(-) create mode 100644 core/ajax/requesttoken.php create mode 100644 core/js/requesttoken.js diff --git a/core/ajax/requesttoken.php b/core/ajax/requesttoken.php new file mode 100644 index 00000000000..96d5402e621 --- /dev/null +++ b/core/ajax/requesttoken.php @@ -0,0 +1,41 @@ + +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE +* License as published by the Free Software Foundation; either +* version 3 of the license, or any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU AFFERO GENERAL PUBLIC LICENSE for more details. +* +* You should have received a copy of the GNU Affero General Public +* License along with this library. +* If not, see . +* +*/ + +/** + * @file core/ajax/requesttoken.php + * @brief Ajax method to retrieve a fresh request protection token for ajax calls + * @return json: success/error state indicator including a fresh request token + * @author Christian Reiner + */ +require_once '../../lib/base.php'; + +// don't load apps or filesystem for this task +$RUNTIME_NOAPPS = TRUE; +$RUNTIME_NOSETUPFS = TRUE; + +// Sanity checks +// using OCP\JSON::callCheck() below protects the token refreshing itself. +//OCP\JSON::callCheck ( ); +OCP\JSON::checkLoggedIn ( ); +// hand out a fresh token +OCP\JSON::success ( array ( 'token' => OCP\Util::callRegister() ) ); +?> diff --git a/core/js/eventsource.js b/core/js/eventsource.js index e3ad7e3a671..45c63715a7e 100644 --- a/core/js/eventsource.js +++ b/core/js/eventsource.js @@ -40,7 +40,7 @@ OC.EventSource=function(src,data){ dataStr+=name+'='+encodeURIComponent(data[name])+'&'; } } - dataStr+='requesttoken='+OC.EventSource.requesttoken; + dataStr+='requesttoken='+OC.Request.Token; if(!this.useFallBack && typeof EventSource !='undefined'){ this.source=new EventSource(src+'?'+dataStr); this.source.onmessage=function(e){ diff --git a/core/js/requesttoken.js b/core/js/requesttoken.js new file mode 100644 index 00000000000..0d78cd7e93b --- /dev/null +++ b/core/js/requesttoken.js @@ -0,0 +1,55 @@ +/** + * ownCloud + * + * @file core/js/requesttoken.js + * @brief Routine to refresh the Request protection request token periodically + * @author Christian Reiner (arkascha) + * @copyright 2011-2012 Christian Reiner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the license, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. + * If not, see . + * + */ + +OC.Request = { + // the request token + Token: {}, + // the lifespan span (in secs) + Lifespan: {}, + // method to refresh the local request token periodically + Refresh: function(){ + // just a client side console log to preserve efficiency + console.log("refreshing request token (lifebeat)"); + var dfd=new $.Deferred(); + $.ajax({ + type: 'POST', + url: OC.filePath('core','ajax','requesttoken.php'), + cache: false, + data: { }, + dataType: 'json' + }).done(function(response){ + // store refreshed token inside this class + OC.Request.Token=response.token; + dfd.resolve(); + }).fail(dfd.reject); + return dfd; + } +} +// accept requesttoken and lifespan into the OC namespace +OC.Request.Token = oc_requesttoken; +OC.Request.Lifespan = oc_requestlifespan; +// refresh the request token periodically shortly before it becomes invalid on the server side +setInterval(OC.Request.Refresh,Math.floor(1000*OC.Request.Lifespan*0.93)), // 93% of lifespan value, close to when the token expires +// early bind token as additional ajax argument for every single request +$(document).bind('ajaxSend', function(elm, xhr, s){xhr.setRequestHeader('requesttoken', OC.Request.Token);}); diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 679be2657d4..25af64c8d57 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -11,6 +11,8 @@ var oc_webroot = ''; var oc_appswebroots = ; var oc_current_user = ''; + var oc_requesttoken = ''; + var oc_requestlifespan = ''; @@ -24,13 +26,6 @@ echo '/>'; ?> - diff --git a/lib/base.php b/lib/base.php index f6afc8fe2fe..5a2decc6f63 100644 --- a/lib/base.php +++ b/lib/base.php @@ -240,6 +240,8 @@ class OC{ OC_Util::addScript( "jquery-tipsy" ); OC_Util::addScript( "oc-dialogs" ); OC_Util::addScript( "js" ); + // request protection token MUST be defined after the jquery library but before any $('document').ready() + OC_Util::addScript( "requesttoken" ); OC_Util::addScript( "eventsource" ); OC_Util::addScript( "config" ); //OC_Util::addScript( "multiselect" ); diff --git a/lib/template.php b/lib/template.php index 0987d6f0d88..0033683b66f 100644 --- a/lib/template.php +++ b/lib/template.php @@ -155,9 +155,6 @@ class OC_Template{ $this->renderas = $renderas; $this->application = $app; $this->vars = array(); - if($renderas == 'user') { - $this->vars['requesttoken'] = OC_Util::callRegister(); - } $parts = explode('/', $app); // fix translation when app is something like core/lostpassword $this->l10n = OC_L10N::get($parts[0]); header('X-Frame-Options: Sameorigin'); @@ -372,9 +369,6 @@ class OC_Template{ if( $this->renderas ) { $page = new OC_TemplateLayout($this->renderas); - if($this->renderas == 'user') { - $page->assign('requesttoken', $this->vars['requesttoken']); - } // Add custom headers $page->assign('headers',$this->headers, false); diff --git a/lib/util.php b/lib/util.php index 08412464254..b14664c9d1e 100755 --- a/lib/util.php +++ b/lib/util.php @@ -416,14 +416,29 @@ class OC_Util { } /** - * @brief Register an get/post call. This is important to prevent CSRF attacks - * Todo: Write howto + * @brief Static lifespan (in seconds) when a request token expires. + * @see OC_Util::callRegister() + * @see OC_Util::isCallRegistered() + * @description + * Also required for the client side to compute the piont in time when to + * request a fresh token. The client will do so when nearly 97% of the + * timespan coded here has expired. + */ + public static $callLifespan = 3600; // 3600 secs = 1 hour + + /** + * @brief Register an get/post call. Important to prevent CSRF attacks. + * @todo Write howto: CSRF protection guide * @return $token Generated token. + * @description + * Creates a 'request token' (random) and stores it inside the session. + * Ever subsequent (ajax) request must use such a valid token to succeed, + * otherwise the request will be denied as a protection against CSRF. + * The tokens expire after a fixed lifespan. + * @see OC_Util::$callLifespan + * @see OC_Util::isCallRegistered() */ public static function callRegister() { - //mamimum time before token exires - $maxtime=(60*60); // 1 hour - // generate a random token. $token=mt_rand(1000,9000).mt_rand(1000,9000).mt_rand(1000,9000); @@ -436,7 +451,8 @@ class OC_Util { foreach($_SESSION as $key=>$value) { // search all tokens in the session if(substr($key,0,12)=='requesttoken') { - if($value+$maxtime Date: Fri, 28 Sep 2012 16:38:25 +0200 Subject: [PATCH 12/42] Added name to AUTHORS file, since mentioned in file headers. --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index b701c768d3e..2404174e328 100644 --- a/AUTHORS +++ b/AUTHORS @@ -17,6 +17,7 @@ ownCloud is written by: Sam Tuke Simon Birnbach Lukas Reschke + Christian Reiner … With help from many libraries and frameworks including: From f8f73e267550a46dc4cee5b025e83d786cddb1bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Fri, 28 Sep 2012 17:44:46 +0200 Subject: [PATCH 13/42] move back to "lastmodified" property since "getlastmodified" is protected by webdav --- lib/connector/sabre/node.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php index 55fa0dfde66..bdedc030c88 100644 --- a/lib/connector/sabre/node.php +++ b/lib/connector/sabre/node.php @@ -23,8 +23,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IProperties { const GETETAG_PROPERTYNAME = '{DAV:}getetag'; - const LASTMODIFIED_PROPERTYNAME_DEPRECIATED = '{DAV:}lastmodified'; // FIXME: keept for the transition period, can be removed for OC 4.5.1 if the sync client update too - const GETLASTMODIFIED_PROPERTYNAME = '{DAV:}getlastmodified'; + const LASTMODIFIED_PROPERTYNAME = '{DAV:}lastmodified'; /** * The path to the current node @@ -151,9 +150,8 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr $query->execute( array( OC_User::getUser(), $this->path, $propertyName )); } } - else { //FIXME: first part of if statement can be removed together with the LASTMODIFIED_PROPERTYNAME_DEPRECIATED const for oc4.5.1 if the sync client was updated too - if( strcmp( $propertyName, self::LASTMODIFIED_PROPERTYNAME_DEPRECIATED) === 0 || - strcmp( $propertyName, self::GETLASTMODIFIED_PROPERTYNAME) === 0 ) { + else { + if( strcmp( $propertyName, self::LASTMODIFIED_PROPERTYNAME) === 0 ) { $this->touch($propertyValue); } else { if(!array_key_exists( $propertyName, $existing )) { From 35357f3afb90dec1d0a9755ab0e0504a916c5e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Fri, 28 Sep 2012 18:47:54 +0200 Subject: [PATCH 14/42] etag has to be removed after version rollback to enable the sync client to detect the changes (bug #1829) --- lib/filesystem.php | 9 ++++++++- lib/filesystemview.php | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/filesystem.php b/lib/filesystem.php index f5c10923b32..5516aae3976 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -521,12 +521,19 @@ class OC_Filesystem{ return self::$defaultInstance->hasUpdated($path,$time); } - static public function removeETagHook($params) { + static public function removeETagHook($params, $root = false) { if (isset($params['path'])) { $path=$params['path']; } else { $path=$params['oldpath']; } + + if (root) { // reduce path to the required part of it (no 'username/files') + $fakeRootView = new OC_FilesystemView($root); + $count = 1; + $path=str_replace(OC_App::getStorage("files")->getAbsolutePath(), "", $fakeRootView->getAbsolutePath($path), $count); + } + $path = self::normalizePath($path); OC_Connector_Sabre_Node::removeETagPropertyForPath($path); } diff --git a/lib/filesystemview.php b/lib/filesystemview.php index 02a0b521053..2950ced5f9e 100644 --- a/lib/filesystemview.php +++ b/lib/filesystemview.php @@ -451,8 +451,9 @@ class OC_FilesystemView { OC_Filesystem::signal_post_write, array( OC_Filesystem::signal_param_path => $path2) ); - } else { // no real copy, file comes from somewhere else, e.g. version rollback -> just update the file cache without all the other post_write actions + } else { // no real copy, file comes from somewhere else, e.g. version rollback -> just update the file cache and the webdav properties without all the other post_write actions OC_FileCache_Update::update($path2, $this->fakeRoot); + OC_Filesystem::removeETagHook(array("path" => $path2), $this->fakeRoot); } return $result; } From 71454b1bca0accd1ab5d7628169d4714bb682030 Mon Sep 17 00:00:00 2001 From: Christian Reiner Date: Fri, 28 Sep 2012 18:57:20 +0200 Subject: [PATCH 15/42] Fix to preserve backward compatibility for apps creating static links containing the request token (currently the contacts app and maybe some 3rd party implementations) --- core/templates/layout.user.php | 4 ++-- lib/template.php | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 25af64c8d57..b6d8a7604a2 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -11,8 +11,8 @@ var oc_webroot = ''; var oc_appswebroots = ; var oc_current_user = ''; - var oc_requesttoken = ''; - var oc_requestlifespan = ''; + var oc_requesttoken = ''; + var oc_requestlifespan = ''; diff --git a/lib/template.php b/lib/template.php index 0033683b66f..681b3f0b140 100644 --- a/lib/template.php +++ b/lib/template.php @@ -155,6 +155,10 @@ class OC_Template{ $this->renderas = $renderas; $this->application = $app; $this->vars = array(); + if($renderas == 'user') { + $this->vars['requesttoken'] = OC_Util::callRegister(); + $this->vars['requestlifespan'] = OC_Util::$callLifespan; + } $parts = explode('/', $app); // fix translation when app is something like core/lostpassword $this->l10n = OC_L10N::get($parts[0]); header('X-Frame-Options: Sameorigin'); @@ -369,6 +373,10 @@ class OC_Template{ if( $this->renderas ) { $page = new OC_TemplateLayout($this->renderas); + if($this->renderas == 'user') { + $page->assign('requesttoken', $this->vars['requesttoken']); + $page->assign('requestlifespan', $this->vars['requestlifespan']); + } // Add custom headers $page->assign('headers',$this->headers, false); From 8f278817709debe1faebafc08493735f78dbfb9d Mon Sep 17 00:00:00 2001 From: scambra Date: Fri, 28 Sep 2012 19:53:18 +0200 Subject: [PATCH 16/42] undo interpolation in js for 4.5 --- core/js/share.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/js/share.js b/core/js/share.js index 36ee39d8eab..6c26fed18be 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -127,9 +127,9 @@ OC.Share={ var html = '