diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php index 4619315ce0..495c821216 100644 --- a/apps/files/ajax/newfile.php +++ b/apps/files/ajax/newfile.php @@ -67,7 +67,7 @@ if($source) { $result=OC_Filesystem::file_put_contents($target, $sourceStream); if($result) { $mime=OC_Filesystem::getMimetype($target); - $eventSource->send('success', $mime); + $eventSource->send('success', array('mime'=>$mime, 'size'=>OC_Filesystem::filesize($target))); } else { $eventSource->send('error', "Error while downloading ".$source. ' to '.$target); } diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 101e2bad2e..aefd6f20be 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -253,10 +253,10 @@ $(document).ready(function() { var img = OC.imagePath('core', 'loading.gif'); var tr=$('tr').filterAttr('data-file',dirName); tr.find('td.filename').attr('style','background-image:url('+img+')'); - uploadtext.text('1 file uploading'); + uploadtext.text(t('files', '1 file uploading')); uploadtext.show(); } else { - uploadtext.text(currentUploads + ' files uploading') + uploadtext.text(currentUploads + ' ' + t('files', 'files uploading')); } } } @@ -301,7 +301,7 @@ $(document).ready(function() { uploadtext.text(''); uploadtext.hide(); } else { - uploadtext.text(currentUploads + ' files uploading') + uploadtext.text(currentUploads + ' ' + t('files', 'files uploading')); } }) .error(function(jqXHR, textStatus, errorThrown) { @@ -316,7 +316,7 @@ $(document).ready(function() { uploadtext.text(''); uploadtext.hide(); } else { - uploadtext.text(currentUploads + ' files uploading') + uploadtext.text(currentUploads + ' ' + t('files', 'files uploading')); } $('#notification').hide(); $('#notification').text(t('files', 'Upload cancelled.')); @@ -556,10 +556,12 @@ $(document).ready(function() { eventSource.listen('progress',function(progress){ $('#uploadprogressbar').progressbar('value',progress); }); - eventSource.listen('success',function(mime){ + eventSource.listen('success',function(data){ + var mime=data.mime; + var size=data.size; $('#uploadprogressbar').fadeOut(); var date=new Date(); - FileList.addFile(localName,0,date,false,hidden); + FileList.addFile(localName,size,date,false,hidden); var tr=$('tr').filterAttr('data-file',localName); tr.data('mime',mime); getMimeIcon(mime,function(path){ @@ -661,7 +663,7 @@ function scanFiles(force,dir){ var scannerEventSource=new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force,dir:dir}); scanFiles.cancel=scannerEventSource.close.bind(scannerEventSource); scannerEventSource.listen('scanning',function(data){ - $('#scan-count').text(data.count+' files scanned'); + $('#scan-count').text(data.count + ' ' + t('files', 'files scanned')); $('#scan-current').text(data.file+'/'); }); scannerEventSource.listen('success',function(success){ @@ -669,7 +671,7 @@ function scanFiles(force,dir){ if(success){ window.location.reload(); }else{ - alert('error while scanning'); + alert(t('files', 'error while scanning')); } }); } diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php index 324fae16f0..701c3e877a 100644 --- a/apps/files/l10n/de.php +++ b/apps/files/l10n/de.php @@ -52,5 +52,5 @@ "Upload too large" => "Upload zu groß", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.", "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.", -"Current scanning" => "Scannen" +"Current scanning" => "Scanne" ); diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php index b586ce1e8c..d2be21b711 100644 --- a/apps/files_external/settings.php +++ b/apps/files_external/settings.php @@ -21,7 +21,9 @@ */ OCP\Util::addScript('files_external', 'settings'); +OCP\Util::addscript('3rdparty', 'chosen/chosen.jquery.min'); OCP\Util::addStyle('files_external', 'settings'); +OCP\Util::addStyle('3rdparty', 'chosen/chosen'); $tmpl = new OCP\Template('files_external', 'settings'); $tmpl->assign('isAdminPage', true, false); $tmpl->assign('mounts', OC_Mount_Config::getSystemMountPoints()); diff --git a/apps/files_versions/l10n/ca.php b/apps/files_versions/l10n/ca.php index b6ddc6feec..51ff7aba1d 100644 --- a/apps/files_versions/l10n/ca.php +++ b/apps/files_versions/l10n/ca.php @@ -1,6 +1,5 @@ "Expira totes les versions", "Versions" => "Versions", -"This will delete all existing backup versions of your files" => "Això eliminarà totes les versions de còpia de seguretat dels vostres fitxers", -"Enable Files Versioning" => "Habilita les versions de fitxers" +"This will delete all existing backup versions of your files" => "Això eliminarà totes les versions de còpia de seguretat dels vostres fitxers" ); diff --git a/apps/files_versions/l10n/cs_CZ.php b/apps/files_versions/l10n/cs_CZ.php index 4f33c1915f..5d19f59d70 100644 --- a/apps/files_versions/l10n/cs_CZ.php +++ b/apps/files_versions/l10n/cs_CZ.php @@ -1,6 +1,5 @@ "Vypršet všechny verze", "Versions" => "Verze", -"This will delete all existing backup versions of your files" => "Odstraní všechny existující zálohované verze Vašich souborů", -"Enable Files Versioning" => "Povolit verzování souborů" +"This will delete all existing backup versions of your files" => "Odstraní všechny existující zálohované verze Vašich souborů" ); diff --git a/apps/files_versions/l10n/da.php b/apps/files_versions/l10n/da.php index 9fafef99fe..6a69fdbe4c 100644 --- a/apps/files_versions/l10n/da.php +++ b/apps/files_versions/l10n/da.php @@ -1,6 +1,5 @@ "Lad alle versioner udløbe", "Versions" => "Versioner", -"This will delete all existing backup versions of your files" => "Dette vil slette alle eksisterende backupversioner af dine filer", -"Enable Files Versioning" => "Aktiver filversionering" +"This will delete all existing backup versions of your files" => "Dette vil slette alle eksisterende backupversioner af dine filer" ); diff --git a/apps/files_versions/l10n/de.php b/apps/files_versions/l10n/de.php index 2c15884d1b..079d96e679 100644 --- a/apps/files_versions/l10n/de.php +++ b/apps/files_versions/l10n/de.php @@ -1,6 +1,5 @@ "Alle Versionen löschen", "Versions" => "Versionen", -"This will delete all existing backup versions of your files" => "Dies löscht alle vorhandenen Sicherungsversionen Ihrer Dateien.", -"Enable Files Versioning" => "Datei-Versionierung aktivieren" +"This will delete all existing backup versions of your files" => "Dies löscht alle vorhandenen Sicherungsversionen Ihrer Dateien." ); diff --git a/apps/files_versions/l10n/el.php b/apps/files_versions/l10n/el.php index 8953c96bd1..c26ad806bb 100644 --- a/apps/files_versions/l10n/el.php +++ b/apps/files_versions/l10n/el.php @@ -1,4 +1,3 @@ "Λήξη όλων των εκδόσεων", -"Enable Files Versioning" => "Ενεργοποίηση παρακολούθησης εκδόσεων αρχείων" +"Expire all versions" => "Λήξη όλων των εκδόσεων" ); diff --git a/apps/files_versions/l10n/eo.php b/apps/files_versions/l10n/eo.php index 2f22b5ac0a..d0f89c576d 100644 --- a/apps/files_versions/l10n/eo.php +++ b/apps/files_versions/l10n/eo.php @@ -1,6 +1,5 @@ "Eksvalidigi ĉiujn eldonojn", "Versions" => "Eldonoj", -"This will delete all existing backup versions of your files" => "Ĉi tio forigos ĉiujn estantajn sekurkopiajn eldonojn de viaj dosieroj", -"Enable Files Versioning" => "Kapabligi dosiereldonkontrolon" +"This will delete all existing backup versions of your files" => "Ĉi tio forigos ĉiujn estantajn sekurkopiajn eldonojn de viaj dosieroj" ); diff --git a/apps/files_versions/l10n/es.php b/apps/files_versions/l10n/es.php index 83d7ed0da2..1acab15299 100644 --- a/apps/files_versions/l10n/es.php +++ b/apps/files_versions/l10n/es.php @@ -1,6 +1,5 @@ "Expirar todas las versiones", "Versions" => "Versiones", -"This will delete all existing backup versions of your files" => "Esto eliminará todas las versiones guardadas como copia de seguridad de tus archivos", -"Enable Files Versioning" => "Habilitar versionamiento de archivos" +"This will delete all existing backup versions of your files" => "Esto eliminará todas las versiones guardadas como copia de seguridad de tus archivos" ); diff --git a/apps/files_versions/l10n/et_EE.php b/apps/files_versions/l10n/et_EE.php index cfc48537e0..f1ebd082ad 100644 --- a/apps/files_versions/l10n/et_EE.php +++ b/apps/files_versions/l10n/et_EE.php @@ -1,6 +1,5 @@ "Kõikide versioonide aegumine", "Versions" => "Versioonid", -"This will delete all existing backup versions of your files" => "See kustutab kõik sinu failidest tehtud varuversiooni", -"Enable Files Versioning" => "Luba failide versioonihaldus" +"This will delete all existing backup versions of your files" => "See kustutab kõik sinu failidest tehtud varuversiooni" ); diff --git a/apps/files_versions/l10n/eu.php b/apps/files_versions/l10n/eu.php index 0f065c1e93..889e762c6b 100644 --- a/apps/files_versions/l10n/eu.php +++ b/apps/files_versions/l10n/eu.php @@ -1,6 +1,5 @@ "Iraungi bertsio guztiak", "Versions" => "Bertsioak", -"This will delete all existing backup versions of your files" => "Honek zure fitxategien bertsio guztiak ezabatuko ditu", -"Enable Files Versioning" => "Gaitu fitxategien bertsioak" +"This will delete all existing backup versions of your files" => "Honek zure fitxategien bertsio guztiak ezabatuko ditu" ); diff --git a/apps/files_versions/l10n/fa.php b/apps/files_versions/l10n/fa.php index e2dc6cba63..98dd415969 100644 --- a/apps/files_versions/l10n/fa.php +++ b/apps/files_versions/l10n/fa.php @@ -1,4 +1,3 @@ "انقضای تمامی نسخهها", -"Enable Files Versioning" => "فعالکردن پروندههای نسخهبندی" +"Expire all versions" => "انقضای تمامی نسخهها" ); diff --git a/apps/files_versions/l10n/fi_FI.php b/apps/files_versions/l10n/fi_FI.php index 5cfcbf28bd..bc8aa67dc7 100644 --- a/apps/files_versions/l10n/fi_FI.php +++ b/apps/files_versions/l10n/fi_FI.php @@ -1,6 +1,5 @@ "Vanhenna kaikki versiot", "Versions" => "Versiot", -"This will delete all existing backup versions of your files" => "Tämä poistaa kaikki tiedostojesi olemassa olevat varmuuskopioversiot", -"Enable Files Versioning" => "Käytä tiedostojen versiointia" +"This will delete all existing backup versions of your files" => "Tämä poistaa kaikki tiedostojesi olemassa olevat varmuuskopioversiot" ); diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php index 965fa02de9..b0e658e8df 100644 --- a/apps/files_versions/l10n/fr.php +++ b/apps/files_versions/l10n/fr.php @@ -1,6 +1,5 @@ "Supprimer les versions intermédiaires", "Versions" => "Versions", -"This will delete all existing backup versions of your files" => "Cette opération va effacer toutes les versions intermédiaires de vos fichiers (et ne garder que la dernière version en date).", -"Enable Files Versioning" => "Activer le versionnage" +"This will delete all existing backup versions of your files" => "Cette opération va effacer toutes les versions intermédiaires de vos fichiers (et ne garder que la dernière version en date)." ); diff --git a/apps/files_versions/l10n/he.php b/apps/files_versions/l10n/he.php index 097169b2a4..09a013f45a 100644 --- a/apps/files_versions/l10n/he.php +++ b/apps/files_versions/l10n/he.php @@ -1,6 +1,5 @@ "הפגת תוקף כל הגרסאות", "Versions" => "גרסאות", -"This will delete all existing backup versions of your files" => "פעולה זו תמחק את כל גיבויי הגרסאות הקיימים של הקבצים שלך", -"Enable Files Versioning" => "הפעלת ניהול גרסאות לקבצים" +"This will delete all existing backup versions of your files" => "פעולה זו תמחק את כל גיבויי הגרסאות הקיימים של הקבצים שלך" ); diff --git a/apps/files_versions/l10n/it.php b/apps/files_versions/l10n/it.php index b7b0b9627b..2b7d2b5c13 100644 --- a/apps/files_versions/l10n/it.php +++ b/apps/files_versions/l10n/it.php @@ -1,6 +1,5 @@ "Scadenza di tutte le versioni", "Versions" => "Versioni", -"This will delete all existing backup versions of your files" => "Ciò eliminerà tutte le versioni esistenti dei tuoi file", -"Enable Files Versioning" => "Abilita controllo di versione" +"This will delete all existing backup versions of your files" => "Ciò eliminerà tutte le versioni esistenti dei tuoi file" ); diff --git a/apps/files_versions/l10n/ja_JP.php b/apps/files_versions/l10n/ja_JP.php index 81d17f56f8..7a00d0b4da 100644 --- a/apps/files_versions/l10n/ja_JP.php +++ b/apps/files_versions/l10n/ja_JP.php @@ -1,6 +1,5 @@ "すべてのバージョンを削除する", "Versions" => "バージョン", -"This will delete all existing backup versions of your files" => "これは、あなたのファイルのすべてのバックアップバージョンを削除します", -"Enable Files Versioning" => "ファイルのバージョン管理を有効にする" +"This will delete all existing backup versions of your files" => "これは、あなたのファイルのすべてのバックアップバージョンを削除します" ); diff --git a/apps/files_versions/l10n/lt_LT.php b/apps/files_versions/l10n/lt_LT.php index 5da209f31b..b3810d06ec 100644 --- a/apps/files_versions/l10n/lt_LT.php +++ b/apps/files_versions/l10n/lt_LT.php @@ -1,4 +1,3 @@ "Panaikinti visų versijų galiojimą", -"Enable Files Versioning" => "Įjungti failų versijų vedimą" +"Expire all versions" => "Panaikinti visų versijų galiojimą" ); diff --git a/apps/files_versions/l10n/nl.php b/apps/files_versions/l10n/nl.php index da31603ff5..486b4ed45c 100644 --- a/apps/files_versions/l10n/nl.php +++ b/apps/files_versions/l10n/nl.php @@ -1,6 +1,5 @@ "Alle versies laten verlopen", "Versions" => "Versies", -"This will delete all existing backup versions of your files" => "Dit zal alle bestaande backup versies van uw bestanden verwijderen", -"Enable Files Versioning" => "Activeer file versioning" +"This will delete all existing backup versions of your files" => "Dit zal alle bestaande backup versies van uw bestanden verwijderen" ); diff --git a/apps/files_versions/l10n/pl.php b/apps/files_versions/l10n/pl.php index c25d37611a..a198792a5b 100644 --- a/apps/files_versions/l10n/pl.php +++ b/apps/files_versions/l10n/pl.php @@ -1,6 +1,5 @@ "Wygasają wszystkie wersje", "Versions" => "Wersje", -"This will delete all existing backup versions of your files" => "Spowoduje to usunięcie wszystkich istniejących wersji kopii zapasowych plików", -"Enable Files Versioning" => "Włącz wersjonowanie plików" +"This will delete all existing backup versions of your files" => "Spowoduje to usunięcie wszystkich istniejących wersji kopii zapasowych plików" ); diff --git a/apps/files_versions/l10n/pt_BR.php b/apps/files_versions/l10n/pt_BR.php index a90b48fe3a..102b6d6274 100644 --- a/apps/files_versions/l10n/pt_BR.php +++ b/apps/files_versions/l10n/pt_BR.php @@ -1,4 +1,3 @@ "Expirar todas as versões", -"Enable Files Versioning" => "Habilitar versionamento de arquivos" +"Expire all versions" => "Expirar todas as versões" ); diff --git a/apps/files_versions/l10n/ru.php b/apps/files_versions/l10n/ru.php index 675dd090d3..f91cae90a1 100644 --- a/apps/files_versions/l10n/ru.php +++ b/apps/files_versions/l10n/ru.php @@ -1,6 +1,5 @@ "Просрочить все версии", "Versions" => "Версии", -"This will delete all existing backup versions of your files" => "Очистить список версий ваших файлов", -"Enable Files Versioning" => "Включить ведение версий файлов" +"This will delete all existing backup versions of your files" => "Очистить список версий ваших файлов" ); diff --git a/apps/files_versions/l10n/sl.php b/apps/files_versions/l10n/sl.php index aec6edb3c2..8c67b56883 100644 --- a/apps/files_versions/l10n/sl.php +++ b/apps/files_versions/l10n/sl.php @@ -1,6 +1,5 @@ "Zastaraj vse različice", "Versions" => "Različice", -"This will delete all existing backup versions of your files" => "To bo izbrisalo vse obstoječe različice varnostnih kopij vaših datotek", -"Enable Files Versioning" => "Omogoči sledenje različicam datotek" +"This will delete all existing backup versions of your files" => "To bo izbrisalo vse obstoječe različice varnostnih kopij vaših datotek" ); diff --git a/apps/files_versions/l10n/sv.php b/apps/files_versions/l10n/sv.php index 5788d8ae19..16fd9890bf 100644 --- a/apps/files_versions/l10n/sv.php +++ b/apps/files_versions/l10n/sv.php @@ -1,6 +1,5 @@ "Upphör alla versioner", "Versions" => "Versioner", -"This will delete all existing backup versions of your files" => "Detta kommer att radera alla befintliga säkerhetskopior av dina filer", -"Enable Files Versioning" => "Aktivera versionshantering" +"This will delete all existing backup versions of your files" => "Detta kommer att radera alla befintliga säkerhetskopior av dina filer" ); diff --git a/apps/files_versions/l10n/th_TH.php b/apps/files_versions/l10n/th_TH.php index 4f26e3bd03..5e075d54a7 100644 --- a/apps/files_versions/l10n/th_TH.php +++ b/apps/files_versions/l10n/th_TH.php @@ -1,6 +1,5 @@ "หมดอายุทุกรุ่น", "Versions" => "รุ่น", -"This will delete all existing backup versions of your files" => "นี่จะเป็นลบทิ้งไฟล์รุ่นที่ทำการสำรองข้อมูลทั้งหมดที่มีอยู่ของคุณทิ้งไป", -"Enable Files Versioning" => "เปิดใช้งานคุณสมบัติการแยกสถานะรุ่นหรือเวอร์ชั่นของไฟล์" +"This will delete all existing backup versions of your files" => "นี่จะเป็นลบทิ้งไฟล์รุ่นที่ทำการสำรองข้อมูลทั้งหมดที่มีอยู่ของคุณทิ้งไป" ); diff --git a/apps/files_versions/l10n/vi.php b/apps/files_versions/l10n/vi.php index 6743395481..992c0751d0 100644 --- a/apps/files_versions/l10n/vi.php +++ b/apps/files_versions/l10n/vi.php @@ -1,6 +1,5 @@ "Hết hạn tất cả các phiên bản", "Versions" => "Phiên bản", -"This will delete all existing backup versions of your files" => "Điều này sẽ xóa tất cả các phiên bản sao lưu hiện có ", -"Enable Files Versioning" => "BẬT tập tin phiên bản" +"This will delete all existing backup versions of your files" => "Điều này sẽ xóa tất cả các phiên bản sao lưu hiện có " ); diff --git a/apps/files_versions/l10n/zh_CN.php b/apps/files_versions/l10n/zh_CN.php index 56a474be89..ba2ea40df9 100644 --- a/apps/files_versions/l10n/zh_CN.php +++ b/apps/files_versions/l10n/zh_CN.php @@ -1,6 +1,5 @@ "过期所有版本", "Versions" => "版本", -"This will delete all existing backup versions of your files" => "将会删除您的文件的所有备份版本", -"Enable Files Versioning" => "开启文件版本" +"This will delete all existing backup versions of your files" => "将会删除您的文件的所有备份版本" ); diff --git a/apps/files_versions/templates/settings.php b/apps/files_versions/templates/settings.php index 8682fc0f49..88063cb075 100644 --- a/apps/files_versions/templates/settings.php +++ b/apps/files_versions/templates/settings.php @@ -1,5 +1,6 @@
diff --git a/core/l10n/he.php b/core/l10n/he.php index f0a18103a8..74b6fe7aa4 100644 --- a/core/l10n/he.php +++ b/core/l10n/he.php @@ -50,6 +50,7 @@ "Database user" => "שם משתמש במסד הנתונים", "Database password" => "ססמת מסד הנתונים", "Database name" => "שם מסד הנתונים", +"Database tablespace" => "מרחב הכתובות של מסד הנתונים", "Database host" => "שרת בסיס נתונים", "Finish setup" => "סיום התקנה", "web services under your control" => "שירותי רשת בשליטתך", diff --git a/l10n/af/files_versions.po b/l10n/af/files_versions.po index 48efcf1e43..feda4351a8 100644 --- a/l10n/af/files_versions.po +++ b/l10n/af/files_versions.po @@ -7,15 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-01 13:35+0200\n" -"PO-Revision-Date: 2012-09-01 11:35+0000\n" +"POT-Creation-Date: 2012-09-17 02:02+0200\n" +"PO-Revision-Date: 2012-09-17 00:04+0000\n" "Last-Translator: I Robot