diff options
357 files changed, 6849 insertions, 4863 deletions
@@ -4,6 +4,7 @@ A personal cloud which runs on your own server. http://ownCloud.org Installation instructions: http://owncloud.org/support +Contribution Guidelines: http://owncloud.org/dev/contribute/ Source code: https://github.com/owncloud Mailing list: https://mail.kde.org/mailman/listinfo/owncloud @@ -16,4 +17,4 @@ Please submit translations via Transifex: https://www.transifex.com/projects/p/owncloud/ For more detailed information about translations: -http://owncloud.org/dev/translation/
\ No newline at end of file +http://owncloud.org/dev/translation/ diff --git a/apps/files/admin.php b/apps/files/admin.php index e8b3cb0aca0..76616bc4373 100644 --- a/apps/files/admin.php +++ b/apps/files/admin.php @@ -35,7 +35,7 @@ $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size')); $post_max_size_possible = OCP\Util::computerFileSize(get_cfg_var('post_max_size')); $maxUploadFilesize = OCP\Util::humanFileSize(min($upload_max_filesize, $post_max_size)); $maxUploadFilesizePossible = OCP\Util::humanFileSize(min($upload_max_filesize_possible, $post_max_size_possible)); -if($_POST) { +if($_POST && OC_Util::isCallRegistered()) { if(isset($_POST['maxUploadSize'])) { if(($setMaxSize = OC_Files::setUploadLimit(OCP\Util::computerFileSize($_POST['maxUploadSize']))) !== false) { $maxUploadFilesize = OCP\Util::humanFileSize($setMaxSize); diff --git a/apps/files/ajax/autocomplete.php b/apps/files/ajax/autocomplete.php index fae38368a85..b32ba7c3d5b 100644 --- a/apps/files/ajax/autocomplete.php +++ b/apps/files/ajax/autocomplete.php @@ -44,7 +44,7 @@ if(OC_Filesystem::file_exists($base) and OC_Filesystem::is_dir($base)) { if(substr(strtolower($file), 0, $queryLen)==$query) { $item=$base.$file; if((!$dirOnly or OC_Filesystem::is_dir($item))) { - $files[]=(object)array('id'=>$item,'label'=>$item,'name'=>$item); + $files[]=(object)array('id'=>$item, 'label'=>$item, 'name'=>$item); } } } diff --git a/apps/files/ajax/move.php b/apps/files/ajax/move.php index db8f59b43d1..5612716b7e4 100644 --- a/apps/files/ajax/move.php +++ b/apps/files/ajax/move.php @@ -9,10 +9,10 @@ OCP\JSON::callCheck(); // Get data $dir = stripslashes($_GET["dir"]); $file = stripslashes($_GET["file"]); -$target = stripslashes(urldecode($_GET["target"])); +$target = stripslashes(rawurldecode($_GET["target"])); -if(OC_Filesystem::file_exists($target . '/' . $file)){ +if(OC_Filesystem::file_exists($target . '/' . $file)) { OCP\JSON::error(array("data" => array( "message" => "Could not move $file - File with this name already exists" ))); exit; } diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index dc830570403..4ed0bbc5b0f 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -38,7 +38,7 @@ $totalSize=0; foreach($files['size'] as $size) { $totalSize+=$size; } -if($totalSize>OC_Filesystem::free_space($dir)){ +if($totalSize>OC_Filesystem::free_space($dir)) { OCP\JSON::error(array("data" => array( "message" => "Not enough space available" ))); exit(); } @@ -51,7 +51,7 @@ if(strpos($dir, '..') === false) { if(is_uploaded_file($files['tmp_name'][$i]) and OC_Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) { $meta = OC_FileCache::get($target); $id = OC_FileCache::getId($target); - $result[]=array( "status" => "success", 'mime'=>$meta['mimetype'],'size'=>$meta['size'], 'id'=>$id, 'name'=>basename($target)); + $result[]=array( "status" => "success", 'mime'=>$meta['mimetype'], 'size'=>$meta['size'], 'id'=>$id, 'name'=>basename($target)); } } OCP\JSON::encodedPrint($result); diff --git a/apps/files/appinfo/filesync.php b/apps/files/appinfo/filesync.php index c1fe444cec7..0e368cb0f42 100644 --- a/apps/files/appinfo/filesync.php +++ b/apps/files/appinfo/filesync.php @@ -20,8 +20,8 @@ * The final URL will look like http://.../remote.php/filesync/oc_chunked/path/to/file */ -// only need filesystem apps -$RUNTIME_APPTYPES=array('filesystem','authentication'); +// load needed apps +$RUNTIME_APPTYPES=array('filesystem', 'authentication', 'logging'); OC_App::loadApps($RUNTIME_APPTYPES); if(!OC_User::isLoggedIn()) { if(!isset($_SERVER['PHP_AUTH_USER'])) { @@ -36,7 +36,7 @@ if(!OC_User::isLoggedIn()) { } } -list($type,$file) = explode('/', substr($path_info,1+strlen($service)+1), 2); +list($type, $file) = explode('/', substr($path_info, 1+strlen($service)+1), 2); if ($type != 'oc_chunked') { OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND); diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php index 9c7b9ab6d5b..400a978fb17 100644 --- a/apps/files/appinfo/remote.php +++ b/apps/files/appinfo/remote.php @@ -22,8 +22,9 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. * */ -// only need filesystem apps -$RUNTIME_APPTYPES=array('filesystem', 'authentication'); +// load needed apps +$RUNTIME_APPTYPES=array('filesystem', 'authentication', 'logging'); + OC_App::loadApps($RUNTIME_APPTYPES); // Backends @@ -41,6 +42,7 @@ $server->setBaseUri($baseuri); $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud')); $server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend)); $server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload +$server->addPlugin(new OC_Connector_Sabre_QuotaPlugin()); // And off we go! $server->exec(); diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php index bcbbc6035fa..29782ec643e 100644 --- a/apps/files/appinfo/update.php +++ b/apps/files/appinfo/update.php @@ -5,10 +5,10 @@ $installedVersion=OCP\Config::getAppValue('files', 'installed_version'); if (version_compare($installedVersion, '1.1.6', '<')) { $query = OC_DB::prepare( "SELECT `propertyname`, `propertypath`, `userid` FROM `*PREFIX*properties`" ); $result = $query->execute(); - while( $row = $result->fetchRow()){ + $updateQuery = OC_DB::prepare('UPDATE `*PREFIX*properties` SET `propertyname` = ? WHERE `userid` = ? AND `propertypath` = ?'); + while( $row = $result->fetchRow()) { if ( $row["propertyname"][0] != '{' ) { - $query = OC_DB::prepare( 'UPDATE `*PREFIX*properties` SET `propertyname` = ? WHERE `userid` = ? AND `propertypath` = ?' ); - $query->execute( array( '{DAV:}' + $row["propertyname"], $row["userid"], $row["propertypath"] )); + $updateQuery->execute(array('{DAV:}' + $row["propertyname"], $row["userid"], $row["propertypath"])); } } } @@ -39,7 +39,7 @@ foreach($filesToRemove as $file) { $success = OCP\Files::rmdirr($filepath); if($success === false) { //probably not sufficient privileges, give up and give a message. - OCP\Util::writeLog('files','Could not clean /files/ directory. Please remove everything except webdav.php from ' . OC::$SERVERROOT . '/files/', OCP\Util::ERROR); + OCP\Util::writeLog('files', 'Could not clean /files/ directory. Please remove everything except webdav.php from ' . OC::$SERVERROOT . '/files/', OCP\Util::ERROR); break; } } diff --git a/apps/files/download.php b/apps/files/download.php index ff6aefbbe0f..0d632c9b2c2 100644 --- a/apps/files/download.php +++ b/apps/files/download.php @@ -32,7 +32,7 @@ $filename = $_GET["file"]; if(!OC_Filesystem::file_exists($filename)) { header("HTTP/1.0 404 Not Found"); $tmpl = new OCP\Template( '', '404', 'guest' ); - $tmpl->assign('file',$filename); + $tmpl->assign('file', $filename); $tmpl->printPage(); exit; } diff --git a/apps/files/index.php b/apps/files/index.php index 3441e371a31..c46ec59d03c 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -36,7 +36,7 @@ if(!isset($_SESSION['timezone'])) { } OCP\App::setActiveNavigationEntry( 'files_index' ); // Load the files -$dir = isset( $_GET['dir'] ) ? urldecode(stripslashes($_GET['dir'])) : ''; +$dir = isset( $_GET['dir'] ) ? rawurldecode(stripslashes($_GET['dir'])) : ''; // Redirect if directory does not exist if(!OC_Filesystem::is_dir($dir.'/')) { header('Location: '.$_SERVER['SCRIPT_NAME'].''); @@ -67,7 +67,7 @@ $breadcrumb = array(); $pathtohere = ''; foreach( explode( '/', $dir ) as $i ) { if( $i != '' ) { - $pathtohere .= '/'.str_replace('+','%20', urlencode($i)); + $pathtohere .= '/'.str_replace('+', '%20', urlencode($i)); $breadcrumb[] = array( 'dir' => $pathtohere, 'name' => $i ); } } @@ -86,7 +86,7 @@ $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size')); $maxUploadFilesize = min($upload_max_filesize, $post_max_size); $freeSpace=OC_Filesystem::free_space($dir); -$freeSpace=max($freeSpace,0); +$freeSpace=max($freeSpace, 0); $maxUploadFilesize = min($maxUploadFilesize, $freeSpace); $permissions = OCP\Share::PERMISSION_READ; diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 82d990bf780..40dd9f14a69 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -70,6 +70,13 @@ var FileActions = { } parent.children('a.name').append('<span class="fileactions" />'); var defaultAction = FileActions.getDefault(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions()); + var actionHandler = function (parent, action, event) { + event.stopPropagation(); + event.preventDefault(); + FileActions.currentFile = parent; + file = FileActions.getCurrentFile(); + action(file); + }; for (name in actions) { // NOTE: Temporary fix to prevent rename action in root of Shared directory if (name === 'Rename' && $('#dir').val() === '/Shared') { @@ -87,14 +94,7 @@ var FileActions = { html += t('files', name) + '</a>'; var element = $(html); element.data('action', name); - element.click(function (event) { - FileActions.currentFile = $(this).parent().parent().parent(); - event.stopPropagation(); - event.preventDefault(); - var action = actions[$(this).data('action')]; - var currentFile = FileActions.getCurrentFile(); - action(currentFile); - }); + element.click(actionHandler.bind(null, parent, actions[name])); parent.find('a.name>span.fileactions').append(element); } } @@ -113,14 +113,8 @@ var FileActions = { if (img) { element.append($('<img class ="svg" src="' + img + '"/>')); } - element.data('action', 'Delete'); - element.click(function (event) { - event.stopPropagation(); - event.preventDefault(); - var action = actions[$(this).data('action')]; - var currentFile = FileActions.getCurrentFile(); - action(currentFile); - }); + element.data('action', actions['Delete']); + element.click(actionHandler.bind(null, parent, actions['Delete'])); parent.parent().children().last().append(element); } }, diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php index a5530851d2e..78b4915f4ed 100644 --- a/apps/files/l10n/ar.php +++ b/apps/files/l10n/ar.php @@ -11,11 +11,13 @@ "Size" => "Øجم", "Modified" => "معدل", "Maximum upload size" => "الØد الأقصى Ù„Øجم الملÙات التي يمكن رÙعها", +"Save" => "ØÙظ", "New" => "جديد", "Text file" => "ملÙ", "Folder" => "مجلد", "Upload" => "إرÙع", "Nothing in here. Upload something!" => "لا يوجد شيء هنا. إرÙع بعض الملÙات!", +"Share" => "شارك", "Download" => "تØميل", "Upload too large" => "Øجم الترÙيع أعلى من المسموØ", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Øجم الملÙات التي تريد ترÙيعها أعلى من Ø§Ù„Ù…Ø³Ù…ÙˆØ Ø¹Ù„Ù‰ الخادم." diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php index 8c8054303bb..0a3bf02e956 100644 --- a/apps/files/l10n/bg_BG.php +++ b/apps/files/l10n/bg_BG.php @@ -16,10 +16,10 @@ "Modified" => "Променено", "Maximum upload size" => "МакÑ. размер за качване", "0 is unlimited" => "0 означава без ограничение", +"Save" => "ЗапиÑ", "New" => "Ðов", "Text file" => "ТекÑтов файл", "Folder" => "Папка", -"From url" => "От url-адреÑ", "Upload" => "Качване", "Cancel upload" => "Отказване на качването", "Nothing in here. Upload something!" => "ÐÑма нищо, качете нещо!", diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php index a4d66b297b2..068031bafc7 100644 --- a/apps/files/l10n/ca.php +++ b/apps/files/l10n/ca.php @@ -58,7 +58,7 @@ "New" => "Nou", "Text file" => "Fitxer de text", "Folder" => "Carpeta", -"From url" => "Des de la url", +"From link" => "Des d'enllaç", "Upload" => "Puja", "Cancel upload" => "Cancel·la la pujada", "Nothing in here. Upload something!" => "Res per aquÃ. Pugeu alguna cosa!", diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php index 9f9542ea809..6d96033a8bc 100644 --- a/apps/files/l10n/cs_CZ.php +++ b/apps/files/l10n/cs_CZ.php @@ -58,7 +58,7 @@ "New" => "Nový", "Text file" => "Textový soubor", "Folder" => "Složka", -"From url" => "Z url", +"From link" => "Z odkazu", "Upload" => "Odeslat", "Cancel upload" => "ZruÅ¡it odesÃlánÃ", "Nothing in here. Upload something!" => "Žádný obsah. Nahrajte nÄ›co.", diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php index 5d45991f2a2..a72ecf5f9ab 100644 --- a/apps/files/l10n/da.php +++ b/apps/files/l10n/da.php @@ -58,7 +58,6 @@ "New" => "Ny", "Text file" => "Tekstfil", "Folder" => "Mappe", -"From url" => "Fra URL", "Upload" => "Upload", "Cancel upload" => "Fortryd upload", "Nothing in here. Upload something!" => "Her er tomt. Upload noget!", diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php index 7dc5831e639..f27565398b2 100644 --- a/apps/files/l10n/de.php +++ b/apps/files/l10n/de.php @@ -58,7 +58,7 @@ "New" => "Neu", "Text file" => "Textdatei", "Folder" => "Ordner", -"From url" => "Von einer URL", +"From link" => "Von einem Link", "Upload" => "Hochladen", "Cancel upload" => "Upload abbrechen", "Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!", diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php index 194bf6b4fda..be8f83c0fca 100644 --- a/apps/files/l10n/de_DE.php +++ b/apps/files/l10n/de_DE.php @@ -58,7 +58,7 @@ "New" => "Neu", "Text file" => "Textdatei", "Folder" => "Ordner", -"From url" => "Von einer URL", +"From link" => "Von einem Link", "Upload" => "Hochladen", "Cancel upload" => "Upload abbrechen", "Nothing in here. Upload something!" => "Alles leer. Bitte laden Sie etwas hoch!", diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php index fef57c62283..93c050b93db 100644 --- a/apps/files/l10n/el.php +++ b/apps/files/l10n/el.php @@ -58,7 +58,6 @@ "New" => "ÎÎο", "Text file" => "ΑÏχείο κειμÎνου", "Folder" => "Φάκελος", -"From url" => "Από την διεÏθυνση", "Upload" => "Αποστολή", "Cancel upload" => "ΑκÏÏωση αποστολής", "Nothing in here. Upload something!" => "Δεν υπάÏχει τίποτα εδώ. ΑνÎβασε κάτι!", diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php index 8d5d59f70dc..4373bbf58b4 100644 --- a/apps/files/l10n/eo.php +++ b/apps/files/l10n/eo.php @@ -27,6 +27,7 @@ "Size" => "Grando", "Modified" => "Modifita", "seconds ago" => "sekundoj antaÅe", +"1 minute ago" => "antaÅ 1 minuto", "today" => "hodiaÅ", "yesterday" => "hieraÅ", "last month" => "lastamonate", @@ -44,7 +45,6 @@ "New" => "Nova", "Text file" => "Tekstodosiero", "Folder" => "Dosierujo", -"From url" => "El URL", "Upload" => "AlÅuti", "Cancel upload" => "Nuligi alÅuton", "Nothing in here. Upload something!" => "Nenio estas ĉi tie. AlÅutu ion!", diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php index 1b783281eb8..04cf10f96b7 100644 --- a/apps/files/l10n/es.php +++ b/apps/files/l10n/es.php @@ -58,7 +58,7 @@ "New" => "Nuevo", "Text file" => "Archivo de texto", "Folder" => "Carpeta", -"From url" => "Desde la URL", +"From link" => "Desde el enlace", "Upload" => "Subir", "Cancel upload" => "Cancelar subida", "Nothing in here. Upload something!" => "Aquà no hay nada. ¡Sube algo!", diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php index f9a943cf9f2..baa9f257808 100644 --- a/apps/files/l10n/es_AR.php +++ b/apps/files/l10n/es_AR.php @@ -58,7 +58,6 @@ "New" => "Nuevo", "Text file" => "Archivo de texto", "Folder" => "Carpeta", -"From url" => "Desde la URL", "Upload" => "Subir", "Cancel upload" => "Cancelar subida", "Nothing in here. Upload something!" => "No hay nada. ¡Subà contenido!", diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php index 9b9679068c6..20789dde99c 100644 --- a/apps/files/l10n/et_EE.php +++ b/apps/files/l10n/et_EE.php @@ -58,7 +58,6 @@ "New" => "Uus", "Text file" => "Tekstifail", "Folder" => "Kaust", -"From url" => "URL-ilt", "Upload" => "Lae üles", "Cancel upload" => "Tühista üleslaadimine", "Nothing in here. Upload something!" => "Siin pole midagi. Lae midagi üles!", diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php index b273c533557..f99c2116077 100644 --- a/apps/files/l10n/eu.php +++ b/apps/files/l10n/eu.php @@ -27,6 +27,7 @@ "Size" => "Tamaina", "Modified" => "Aldatuta", "seconds ago" => "segundu", +"1 minute ago" => "orain dela minutu 1", "today" => "gaur", "yesterday" => "atzo", "last month" => "joan den hilabetean", @@ -44,7 +45,6 @@ "New" => "Berria", "Text file" => "Testu fitxategia", "Folder" => "Karpeta", -"From url" => "URLtik", "Upload" => "Igo", "Cancel upload" => "Ezeztatu igoera", "Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!", diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php index 01a1b1e56f7..ea3aa43b8fa 100644 --- a/apps/files/l10n/fa.php +++ b/apps/files/l10n/fa.php @@ -8,6 +8,7 @@ "Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموÙÙ‚ بود", "Files" => "Ùایل ها", "Delete" => "پاک کردن", +"Rename" => "تغییرنام", "replace" => "جایگزین", "cancel" => "لغو", "undo" => "بازگشت", @@ -20,6 +21,14 @@ "Name" => "نام", "Size" => "اندازه", "Modified" => "تغییر یاÙته", +"seconds ago" => "ثانیه‌ها پیش", +"1 minute ago" => "1 دقیقه پیش", +"today" => "امروز", +"yesterday" => "دیروز", +"last month" => "ماه قبل", +"months ago" => "ماه‌های قبل", +"last year" => "سال قبل", +"years ago" => "سال‌های قبل", "File handling" => "اداره پرونده ها", "Maximum upload size" => "Øداکثر اندازه بارگزاری", "max. possible: " => "Øداکثرمقدارممکن:", @@ -27,10 +36,10 @@ "Enable ZIP-download" => "Ùعال سازی بارگیری پرونده های Ùشرده", "0 is unlimited" => "0 نامØدود است", "Maximum input size for ZIP files" => "Øداکثرمقدار برای بار گزاری پرونده های Ùشرده", +"Save" => "ذخیره", "New" => "جدید", "Text file" => "Ùایل متنی", "Folder" => "پوشه", -"From url" => "از نشانی", "Upload" => "بارگذاری", "Cancel upload" => "متوق٠کردن بار گذاری", "Nothing in here. Upload something!" => "اینجا هیچ چیز نیست.", diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php index fd86c21ffdb..5cbbc83edb0 100644 --- a/apps/files/l10n/fi_FI.php +++ b/apps/files/l10n/fi_FI.php @@ -7,6 +7,7 @@ "Missing a temporary folder" => "Väliaikaiskansiota ei ole olemassa", "Failed to write to disk" => "Levylle kirjoitus epäonnistui", "Files" => "Tiedostot", +"Unshare" => "Peru jakaminen", "Delete" => "Poista", "Rename" => "Nimeä uudelleen", "{new_name} already exists" => "{new_name} on jo olemassa", @@ -49,7 +50,6 @@ "New" => "Uusi", "Text file" => "Tekstitiedosto", "Folder" => "Kansio", -"From url" => "Verkko-osoitteesta", "Upload" => "Lähetä", "Cancel upload" => "Peru lähetys", "Nothing in here. Upload something!" => "Täällä ei ole mitään. Lähetä tänne jotakin!", diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php index 4f0f01fb23d..3068eb92747 100644 --- a/apps/files/l10n/fr.php +++ b/apps/files/l10n/fr.php @@ -58,7 +58,7 @@ "New" => "Nouveau", "Text file" => "Fichier texte", "Folder" => "Dossier", -"From url" => "Depuis URL", +"From link" => "Depuis le lien", "Upload" => "Envoyer", "Cancel upload" => "Annuler l'envoi", "Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)", diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php index bfb455d37f8..7b332d47df3 100644 --- a/apps/files/l10n/gl.php +++ b/apps/files/l10n/gl.php @@ -24,6 +24,14 @@ "Name" => "Nome", "Size" => "Tamaño", "Modified" => "Modificado", +"seconds ago" => "hai segundos", +"1 minute ago" => "hai 1 minuto", +"today" => "hoxe", +"yesterday" => "onte", +"last month" => "último mes", +"months ago" => "meses atrás", +"last year" => "último ano", +"years ago" => "anos atrás", "File handling" => "Manexo de ficheiro", "Maximum upload size" => "Tamaño máximo de envÃo", "max. possible: " => "máx. posible: ", @@ -35,7 +43,6 @@ "New" => "Novo", "Text file" => "Ficheiro de texto", "Folder" => "Cartafol", -"From url" => "Desde url", "Upload" => "Enviar", "Cancel upload" => "Cancelar subida", "Nothing in here. Upload something!" => "Nada por aquÃ. EnvÃe algo.", diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php index 997617673e4..fc169710df0 100644 --- a/apps/files/l10n/he.php +++ b/apps/files/l10n/he.php @@ -7,6 +7,7 @@ "Missing a temporary folder" => "תיקייה ×–×ž× ×™×ª חסרה", "Failed to write to disk" => "הכתיבה ×œ×›×•× ×Ÿ × ×›×©×œ×”", "Files" => "קבצי×", +"Unshare" => "הסר שיתוף", "Delete" => "מחיקה", "generating ZIP-file, it may take some time." => "יוצר קובץ ZIP, ×× × ×”×ž×ª×Ÿ.", "Unable to upload your file as it is a directory or has 0 bytes" => "×œ× ×™×›×•×œ להעלות ×ת הקובץ מכיוון שזו תקיה ×ו שמשקל הקובץ 0 בתי×", @@ -17,6 +18,14 @@ "Name" => "ש×", "Size" => "גודל", "Modified" => "זמן ×©×™× ×•×™", +"seconds ago" => "×©× ×™×•×ª", +"1 minute ago" => "×œ×¤× ×™ דקה ×חת", +"today" => "היו×", +"yesterday" => "×תמול", +"last month" => "חודש שעבר", +"months ago" => "חודשי×", +"last year" => "×©× ×” שעברה", +"years ago" => "×©× ×™×", "File handling" => "טיפול בקבצי×", "Maximum upload size" => "גודל העל××” מקסימלי", "max. possible: " => "המרבי ×”×פשרי: ", @@ -24,10 +33,10 @@ "Enable ZIP-download" => "הפעלת הורדת ZIP", "0 is unlimited" => "0 - ×œ×œ× ×”×’×‘×œ×”", "Maximum input size for ZIP files" => "גודל הקלט המרבי לקובצי ZIP", +"Save" => "שמירה", "New" => "חדש", "Text file" => "קובץ טקסט", "Folder" => "תיקייה", -"From url" => "מכתובת", "Upload" => "העל××”", "Cancel upload" => "ביטול ההעל××”", "Nothing in here. Upload something!" => "×ין ×›×ן ×©×•× ×“×‘×¨. ×ולי ×‘×¨×¦×•× ×š להעלות משהו?", diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php index fa16feaa39a..2209d1f4699 100644 --- a/apps/files/l10n/hr.php +++ b/apps/files/l10n/hr.php @@ -44,7 +44,6 @@ "New" => "novo", "Text file" => "tekstualna datoteka", "Folder" => "mapa", -"From url" => "od URL-a", "Upload" => "PoÅ¡alji", "Cancel upload" => "Prekini upload", "Nothing in here. Upload something!" => "Nema niÄega u ovoj mapi. PoÅ¡alji neÅ¡to!", diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php index 1eeca809d64..6ded4de4800 100644 --- a/apps/files/l10n/hu_HU.php +++ b/apps/files/l10n/hu_HU.php @@ -7,6 +7,7 @@ "Missing a temporary folder" => "Hiányzik az ideiglenes könyvtár", "Failed to write to disk" => "Nem Ãrható lemezre", "Files" => "Fájlok", +"Unshare" => "Nem oszt meg", "Delete" => "Törlés", "replace" => "cserél", "cancel" => "mégse", @@ -20,6 +21,14 @@ "Name" => "Név", "Size" => "Méret", "Modified" => "MódosÃtva", +"seconds ago" => "másodperccel ezelÅ‘tt", +"1 minute ago" => "1 perccel ezelÅ‘tt", +"today" => "ma", +"yesterday" => "tegnap", +"last month" => "múlt hónapban", +"months ago" => "hónappal ezelÅ‘tt", +"last year" => "tavaly", +"years ago" => "évvel ezelÅ‘tt", "File handling" => "Fájlkezelés", "Maximum upload size" => "Maximális feltölthetÅ‘ fájlméret", "max. possible: " => "max. lehetséges", @@ -27,10 +36,10 @@ "Enable ZIP-download" => "ZIP-letöltés engedélyezése", "0 is unlimited" => "0 = korlátlan", "Maximum input size for ZIP files" => "ZIP file-ok maximum mérete", +"Save" => "Mentés", "New" => "Új", "Text file" => "Szövegfájl", "Folder" => "Mappa", -"From url" => "URL-bÅ‘l", "Upload" => "Feltöltés", "Cancel upload" => "Feltöltés megszakÃtása", "Nothing in here. Upload something!" => "Töltsön fel egy fájlt.", diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php index 21a0bb52374..bcebebc1405 100644 --- a/apps/files/l10n/ia.php +++ b/apps/files/l10n/ia.php @@ -1,17 +1,20 @@ <?php $TRANSLATIONS = array( "The uploaded file was only partially uploaded" => "Le file incargate solmente esseva incargate partialmente", "No file was uploaded" => "Nulle file esseva incargate", +"Missing a temporary folder" => "Manca un dossier temporari", "Files" => "Files", "Delete" => "Deler", "Name" => "Nomine", "Size" => "Dimension", "Modified" => "Modificate", "Maximum upload size" => "Dimension maxime de incargamento", +"Save" => "Salveguardar", "New" => "Nove", "Text file" => "File de texto", "Folder" => "Dossier", "Upload" => "Incargar", "Nothing in here. Upload something!" => "Nihil hic. Incarga alcun cosa!", +"Share" => "Compartir", "Download" => "Discargar", "Upload too large" => "Incargamento troppo longe" ); diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php index a11894d1a76..061d28c8f78 100644 --- a/apps/files/l10n/id.php +++ b/apps/files/l10n/id.php @@ -7,6 +7,7 @@ "Missing a temporary folder" => "Kehilangan folder temporer", "Failed to write to disk" => "Gagal menulis ke disk", "Files" => "Berkas", +"Unshare" => "batalkan berbagi", "Delete" => "Hapus", "replace" => "mengganti", "cancel" => "batalkan", @@ -20,6 +21,14 @@ "Name" => "Nama", "Size" => "Ukuran", "Modified" => "Dimodifikasi", +"seconds ago" => "beberapa detik yang lalu", +"1 minute ago" => "1 menit lalu", +"today" => "hari ini", +"yesterday" => "kemarin", +"last month" => "bulan kemarin", +"months ago" => "beberapa bulan lalu", +"last year" => "tahun kemarin", +"years ago" => "beberapa tahun lalu", "File handling" => "Penanganan berkas", "Maximum upload size" => "Ukuran unggah maksimum", "max. possible: " => "Kemungkinan maks:", @@ -27,10 +36,10 @@ "Enable ZIP-download" => "Aktifkan unduhan ZIP", "0 is unlimited" => "0 adalah tidak terbatas", "Maximum input size for ZIP files" => "Ukuran masukan maksimal untuk berkas ZIP", +"Save" => "simpan", "New" => "Baru", "Text file" => "Berkas teks", "Folder" => "Folder", -"From url" => "Dari url", "Upload" => "Unggah", "Cancel upload" => "Batal mengunggah", "Nothing in here. Upload something!" => "Tidak ada apa-apa di sini. Unggah sesuatu!", diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php index 5d3b58e783a..c767fb43b2b 100644 --- a/apps/files/l10n/it.php +++ b/apps/files/l10n/it.php @@ -58,7 +58,7 @@ "New" => "Nuovo", "Text file" => "File di testo", "Folder" => "Cartella", -"From url" => "Da URL", +"From link" => "Da collegamento", "Upload" => "Carica", "Cancel upload" => "Annulla invio", "Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!", diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php index c161f8b3bac..41f26fe3ebc 100644 --- a/apps/files/l10n/ja_JP.php +++ b/apps/files/l10n/ja_JP.php @@ -58,7 +58,6 @@ "New" => "æ–°è¦", "Text file" => "テã‚ストファイル", "Folder" => "フォルダ", -"From url" => "URL", "Upload" => "アップãƒãƒ¼ãƒ‰", "Cancel upload" => "アップãƒãƒ¼ãƒ‰ã‚’ã‚ャンセル", "Nothing in here. Upload something!" => "ã“ã“ã«ã¯ä½•ã‚‚ã‚ã‚Šã¾ã›ã‚“。何ã‹ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„。", diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php index d9672d647c2..cfd0b2fa6ec 100644 --- a/apps/files/l10n/ka_GE.php +++ b/apps/files/l10n/ka_GE.php @@ -58,7 +58,6 @@ "New" => "áƒáƒ®áƒáƒšáƒ˜", "Text file" => "ტექსტური ფáƒáƒ˜áƒšáƒ˜", "Folder" => "სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ე", -"From url" => "მისáƒáƒ›áƒáƒ თიდáƒáƒœ", "Upload" => "áƒáƒ¢áƒ•áƒ˜áƒ თვáƒ", "Cancel upload" => "áƒáƒ¢áƒ•áƒ˜áƒ თვის გáƒáƒ£áƒ¥áƒ›áƒ”ბáƒ", "Nothing in here. Upload something!" => "áƒáƒ¥ áƒáƒ áƒáƒ¤áƒ”რი áƒáƒ áƒáƒ ის. áƒáƒ¢áƒ•áƒ˜áƒ თე რáƒáƒ›áƒ”!", diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php index 05db100e189..d2561e129dd 100644 --- a/apps/files/l10n/ko.php +++ b/apps/files/l10n/ko.php @@ -27,10 +27,10 @@ "Enable ZIP-download" => "ZIP- 다운로드 허용", "0 is unlimited" => "0ì€ ë¬´ì œí•œ 입니다", "Maximum input size for ZIP files" => "ZIP 파ì¼ì— 대한 최대 ìž…ë ¥ í¬ê¸°", +"Save" => "ì €ìž¥", "New" => "새로 만들기", "Text file" => "í…스트 파ì¼", "Folder" => "í´ë”", -"From url" => "URL ì—ì„œ", "Upload" => "업로드", "Cancel upload" => "업로드 취소", "Nothing in here. Upload something!" => "ë‚´ìš©ì´ ì—†ìŠµë‹ˆë‹¤. ì—…ë¡œë“œí• ìˆ˜ 있습니다!", diff --git a/apps/files/l10n/ku_IQ.php b/apps/files/l10n/ku_IQ.php new file mode 100644 index 00000000000..3c40831b83a --- /dev/null +++ b/apps/files/l10n/ku_IQ.php @@ -0,0 +1,7 @@ +<?php $TRANSLATIONS = array( +"Name" => "ناو", +"Save" => "پاشکه‌وتکردن", +"Folder" => "بوخچه", +"Upload" => "بارکردن", +"Download" => "داگرتن" +); diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php index aed0938ff04..4e2ce1b1dbf 100644 --- a/apps/files/l10n/lb.php +++ b/apps/files/l10n/lb.php @@ -27,10 +27,10 @@ "Enable ZIP-download" => "ZIP-download erlaben", "0 is unlimited" => "0 ass onlimitéiert", "Maximum input size for ZIP files" => "Maximal Gréisst fir ZIP Fichieren", +"Save" => "Späicheren", "New" => "Nei", "Text file" => "Text Fichier", "Folder" => "Dossier", -"From url" => "From URL", "Upload" => "Eroplueden", "Cancel upload" => "Upload ofbriechen", "Nothing in here. Upload something!" => "Hei ass näischt. Lued eppes rop!", diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php index d224b8cce8e..87c0f578c5f 100644 --- a/apps/files/l10n/lt_LT.php +++ b/apps/files/l10n/lt_LT.php @@ -58,7 +58,6 @@ "New" => "Naujas", "Text file" => "Teksto failas", "Folder" => "Katalogas", -"From url" => "IÅ¡ adreso", "Upload" => "Ä®kelti", "Cancel upload" => "AtÅ¡aukti siuntimÄ…", "Nothing in here. Upload something!" => "ÄŒia tuÅ¡Äia. Ä®kelkite kÄ… nors!", diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php index 835416c301b..6488ee534ec 100644 --- a/apps/files/l10n/lv.php +++ b/apps/files/l10n/lv.php @@ -2,6 +2,7 @@ "No file was uploaded" => "Neviens fails netika augÅ¡uplÄdÄ“ts", "Failed to write to disk" => "Nav iespÄ“jams saglabÄt", "Files" => "Faili", +"Unshare" => "PÄrtraukt lÄ«dzdalÄ«Å¡anu", "Delete" => "IzdzÄ“st", "replace" => "aizvietot", "cancel" => "atcelt", @@ -22,7 +23,6 @@ "New" => "Jauns", "Text file" => "Teksta fails", "Folder" => "Mape", -"From url" => "No URL saites", "Upload" => "AugÅ¡uplÄdet", "Cancel upload" => "Atcelt augÅ¡uplÄdi", "Nothing in here. Upload something!" => "Te vÄ“l nekas nav. RÄ«kojies, sÄc augÅ¡uplÄdÄ“t", diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php index f8953fbaef6..a3c43d266ff 100644 --- a/apps/files/l10n/mk.php +++ b/apps/files/l10n/mk.php @@ -24,10 +24,10 @@ "Enable ZIP-download" => "Овозможи ZIP Ñимнување ", "0 is unlimited" => "0 е неограничено", "Maximum input size for ZIP files" => "МакÑимална големина за Ð²Ð½ÐµÑ Ð½Ð° ZIP датотеки", +"Save" => "Сними", "New" => "Ðово", "Text file" => "ТекÑтуална датотека", "Folder" => "Папка", -"From url" => "Од адреÑа", "Upload" => "Подигни", "Cancel upload" => "Откажи прикачување", "Nothing in here. Upload something!" => "Тука нема ништо. Снимете нешто!", diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php index 95f1b418c7e..35dda3d8a6b 100644 --- a/apps/files/l10n/ms_MY.php +++ b/apps/files/l10n/ms_MY.php @@ -26,10 +26,10 @@ "Enable ZIP-download" => "Aktifkan muatturun ZIP", "0 is unlimited" => "0 adalah tanpa had", "Maximum input size for ZIP files" => "Saiz maksimum input untuk fail ZIP", +"Save" => "Simpan", "New" => "Baru", "Text file" => "Fail teks", "Folder" => "Folder", -"From url" => "Dari url", "Upload" => "Muat naik", "Cancel upload" => "Batal muat naik", "Nothing in here. Upload something!" => "Tiada apa-apa di sini. Muat naik sesuatu!", diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php index 0fe6d293393..1d914b866aa 100644 --- a/apps/files/l10n/nb_NO.php +++ b/apps/files/l10n/nb_NO.php @@ -10,25 +10,38 @@ "Unshare" => "Avslutt deling", "Delete" => "Slett", "Rename" => "Omdøp", +"{new_name} already exists" => "{new_name} finnes allerede", "replace" => "erstatt", "suggest name" => "foreslÃ¥ navn", "cancel" => "avbryt", +"replaced {new_name}" => "erstatt {new_name}", "undo" => "angre", +"replaced {new_name} with {old_name}" => "erstatt {new_name} med {old_name}", +"deleted {files}" => "slettet {files}", "generating ZIP-file, it may take some time." => "opprettet ZIP-fil, dette kan ta litt tid", "Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes", "Upload Error" => "Opplasting feilet", "Pending" => "Ventende", "1 file uploading" => "1 fil lastes opp", +"{count} files uploading" => "{count} filer laster opp", "Upload cancelled." => "Opplasting avbrutt.", "File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pÃ¥gÃ¥r. Forlater du siden nÃ¥ avbrytes opplastingen.", "Invalid name, '/' is not allowed." => "Ugyldig navn, '/' er ikke tillatt. ", +"{count} files scanned" => "{count} filer lest inn", "error while scanning" => "feil under skanning", "Name" => "Navn", "Size" => "Størrelse", "Modified" => "Endret", +"1 folder" => "1 mappe", +"{count} folders" => "{count} mapper", +"1 file" => "1 fil", +"{count} files" => "{count} filer", "seconds ago" => "sekunder siden", +"1 minute ago" => "1 minutt siden", +"{minutes} minutes ago" => "{minutes} minutter siden", "today" => "i dag", "yesterday" => "i gÃ¥r", +"{days} days ago" => "{days} dager siden", "last month" => "forrige mÃ¥ned", "months ago" => "mÃ¥neder siden", "last year" => "forrige Ã¥r", @@ -44,7 +57,6 @@ "New" => "Ny", "Text file" => "Tekstfil", "Folder" => "Mappe", -"From url" => "Fra url", "Upload" => "Last opp", "Cancel upload" => "Avbryt opplasting", "Nothing in here. Upload something!" => "Ingenting her. Last opp noe!", diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php index e6e5fa52a86..f3bfb397c4f 100644 --- a/apps/files/l10n/nl.php +++ b/apps/files/l10n/nl.php @@ -58,7 +58,6 @@ "New" => "Nieuw", "Text file" => "Tekstbestand", "Folder" => "Map", -"From url" => "Van hyperlink", "Upload" => "Upload", "Cancel upload" => "Upload afbreken", "Nothing in here. Upload something!" => "Er bevindt zich hier niets. Upload een bestand!", diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php index 7af37057ce0..df8dcb0e9cf 100644 --- a/apps/files/l10n/nn_NO.php +++ b/apps/files/l10n/nn_NO.php @@ -11,6 +11,7 @@ "Size" => "Storleik", "Modified" => "Endra", "Maximum upload size" => "Maksimal opplastingsstorleik", +"Save" => "Lagre", "New" => "Ny", "Text file" => "Tekst fil", "Folder" => "Mappe", diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php index d4bb09e94b3..078545b6d55 100644 --- a/apps/files/l10n/oc.php +++ b/apps/files/l10n/oc.php @@ -27,6 +27,7 @@ "Size" => "Talha", "Modified" => "Modificat", "seconds ago" => "secondas", +"1 minute ago" => "1 minuta a", "today" => "uèi", "yesterday" => "ièr", "last month" => "mes passat", @@ -44,7 +45,6 @@ "New" => "Nòu", "Text file" => "Fichièr de tèxte", "Folder" => "Dorsièr", -"From url" => "Dempuèi l'URL", "Upload" => "Amontcarga", "Cancel upload" => " Anulla l'amontcargar", "Nothing in here. Upload something!" => "Pas res dedins. Amontcarga qualquaren", diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php index f84dc7086e6..f2460562087 100644 --- a/apps/files/l10n/pl.php +++ b/apps/files/l10n/pl.php @@ -58,7 +58,6 @@ "New" => "Nowy", "Text file" => "Plik tekstowy", "Folder" => "Katalog", -"From url" => "Z adresu", "Upload" => "PrzeÅ›lij", "Cancel upload" => "PrzestaÅ„ wysyÅ‚ać", "Nothing in here. Upload something!" => "Brak zawartoÅ›ci. ProszÄ™ wysÅ‚ać pliki!", diff --git a/apps/files/l10n/pl_PL.php b/apps/files/l10n/pl_PL.php new file mode 100644 index 00000000000..157d9a41e4d --- /dev/null +++ b/apps/files/l10n/pl_PL.php @@ -0,0 +1,3 @@ +<?php $TRANSLATIONS = array( +"Save" => "Zapisz" +); diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php index 4dfbadc8915..31de3f6e600 100644 --- a/apps/files/l10n/pt_BR.php +++ b/apps/files/l10n/pt_BR.php @@ -10,25 +10,39 @@ "Unshare" => "Descompartilhar", "Delete" => "Excluir", "Rename" => "Renomear", +"{new_name} already exists" => "{new_name} já existe", "replace" => "substituir", "suggest name" => "sugerir nome", "cancel" => "cancelar", +"replaced {new_name}" => "substituÃdo {new_name}", "undo" => "desfazer", +"replaced {new_name} with {old_name}" => "SubstituÃdo {old_name} por {new_name} ", +"unshared {files}" => "{files} não compartilhados", +"deleted {files}" => "{files} apagados", "generating ZIP-file, it may take some time." => "gerando arquivo ZIP, isso pode levar um tempo.", "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", +"{count} files uploading" => "Enviando {count} 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.", +"{count} files scanned" => "{count} arquivos scaneados", "error while scanning" => "erro durante verificação", "Name" => "Nome", "Size" => "Tamanho", "Modified" => "Modificado", +"1 folder" => "1 pasta", +"{count} folders" => "{count} pastas", +"1 file" => "1 arquivo", +"{count} files" => "{count} arquivos", "seconds ago" => "segundos atrás", +"1 minute ago" => "1 minuto atrás", +"{minutes} minutes ago" => "{minutes} minutos atrás", "today" => "hoje", "yesterday" => "ontem", +"{days} days ago" => "{days} dias atrás", "last month" => "último mês", "months ago" => "meses atrás", "last year" => "último ano", @@ -44,7 +58,7 @@ "New" => "Novo", "Text file" => "Arquivo texto", "Folder" => "Pasta", -"From url" => "URL de origem", +"From link" => "Do link", "Upload" => "Carregar", "Cancel upload" => "Cancelar upload", "Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!", diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php index 3343d0d04bb..048c6be8350 100644 --- a/apps/files/l10n/pt_PT.php +++ b/apps/files/l10n/pt_PT.php @@ -58,7 +58,7 @@ "New" => "Novo", "Text file" => "Ficheiro de texto", "Folder" => "Pasta", -"From url" => "Do endereço", +"From link" => "Da ligação", "Upload" => "Enviar", "Cancel upload" => "Cancelar envio", "Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!", diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php index 24df128b826..4358e64e7b3 100644 --- a/apps/files/l10n/ro.php +++ b/apps/files/l10n/ro.php @@ -27,6 +27,7 @@ "Size" => "Dimensiune", "Modified" => "Modificat", "seconds ago" => "secunde în urmă", +"1 minute ago" => "1 minut în urmă", "today" => "astăzi", "yesterday" => "ieri", "last month" => "ultima lună", @@ -44,7 +45,6 @@ "New" => "Nou", "Text file" => "FiÈ™ier text", "Folder" => "Dosar", -"From url" => "De la URL", "Upload" => "ÃŽncarcă", "Cancel upload" => "Anulează încărcarea", "Nothing in here. Upload something!" => "Nimic aici. ÃŽncarcă ceva!", diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php index 2ba14a1ac03..55901937b47 100644 --- a/apps/files/l10n/ru.php +++ b/apps/files/l10n/ru.php @@ -58,7 +58,6 @@ "New" => "Ðовый", "Text file" => "ТекÑтовый файл", "Folder" => "Папка", -"From url" => "С url", "Upload" => "Загрузить", "Cancel upload" => "Отмена загрузки", "Nothing in here. Upload something!" => "ЗдеÑÑŒ ничего нет. Загрузите что-нибудь!", diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php index d9792a1f8ab..33d24ed74de 100644 --- a/apps/files/l10n/ru_RU.php +++ b/apps/files/l10n/ru_RU.php @@ -58,7 +58,7 @@ "New" => "Ðовый", "Text file" => "ТекÑтовый файл", "Folder" => "Папка", -"From url" => "Из url", +"From link" => "По ÑÑылке", "Upload" => "Загрузить ", "Cancel upload" => "Отмена загрузки", "Nothing in here. Upload something!" => "ЗдеÑÑŒ ничего нет. Загрузите что-нибудь!", diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php index b0243e89753..5a51f07f7c8 100644 --- a/apps/files/l10n/si_LK.php +++ b/apps/files/l10n/si_LK.php @@ -1,9 +1,12 @@ <?php $TRANSLATIONS = array( "There is no error, the file uploaded with success" => "නිවà·à¶»à¶¯à·’ à·€ ගොනුව උඩුගචකෙරිනි", +"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "php.ini à·„à·’ upload_max_filesize නියමයට වඩ෠උඩුගචකළ ගොනුව විà·à·à¶½à¶ºà·’", "The uploaded file was only partially uploaded" => "උඩුගචකළ ගොනුවේ කොටසක් පමණක් උඩුගචවිය", "No file was uploaded" => "කිසිදු ගොනවක් උඩුගචනොවිනි", +"Missing a temporary folder" => "à¶à·à·€à¶šà·à¶½à·’ක ෆොල්ඩරයක් සොයà·à¶œà¶ නොහà·à¶š", "Failed to write to disk" => "à¶à·à¶§à·’ගචකිරීම අසà·à¶»à·Šà¶®à¶šà¶ºà·’", "Files" => "ගොනු", +"Unshare" => "නොබෙදු", "Delete" => "මකන්න", "Rename" => "නà·à·€à¶ නම් කරන්න", "replace" => "ප්â€à¶»à¶à·’ස්ථà·à¶´à¶±à¶º කරන්න", @@ -14,12 +17,20 @@ "Upload cancelled." => "උඩුගචකිරීම අà¶à·Š හරින්න ලදී", "Name" => "නම", "Size" => "ප්â€à¶»à¶¸à·à¶«à¶º", +"Modified" => "වෙනස් කළ", "1 file" => "1 ගොනුවක්", +"seconds ago" => "à¶à¶à·Šà¶´à¶»à¶ºà¶±à·Šà¶§ පෙර", +"1 minute ago" => "1 මිනිà¶à·Šà¶à·”වකට පෙර", "today" => "අද", "yesterday" => "පෙර දින", +"last month" => "පෙර මà·à·ƒà¶ºà·š", +"months ago" => "මà·à·ƒ කීපයකට පෙර", +"last year" => "පෙර අවුරුද්දේ", +"years ago" => "අවුරුදු කීපයකට පෙර", "File handling" => "ගොනු පරිහරණය", "Maximum upload size" => "උඩුගචකිරීමක උපරිම ප්â€à¶»à¶¸à·à¶«à¶º", "max. possible: " => "à·„à·à¶šà·’ උපරිමය:", +"0 is unlimited" => "0 යනු සීමà·à·€à¶šà·Š නà·à¶à·’ බවය", "Save" => "සුරකින්න", "New" => "නව", "Text file" => "පෙළ ගොනුව", @@ -27,6 +38,8 @@ "Upload" => "උඩුගචකිරීම", "Cancel upload" => "උඩුගචකිරීම අà¶à·Š හරින්න", "Nothing in here. Upload something!" => "මෙහි කිසිවක් නොමà·à¶. යමක් උඩුගචකරන්න", +"Share" => "බෙදà·à·„දà·à¶œà¶±à·Šà¶±", "Download" => "බà·à¶œà¶ කිරීම", -"Upload too large" => "උඩුගචකිරීම විà·à·à¶½ à·€à·à¶©à·’ය" +"Upload too large" => "උඩුගචකිරීම විà·à·à¶½ à·€à·à¶©à·’ය", +"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ඔබ උඩුගචකිරීමට à¶à·à¶à·Š කරන ගොනු මෙම සේවà·à¶¯à·à¶ºà¶šà¶ºà· උඩුගචකිරීමට ඉඩදී ඇà¶à·’ උපරිම ගොනු විà·à·à¶½à¶à·Šà·€à¶ºà¶§ වඩ෠වà·à¶©à·’ය" ); diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php index cbb89eb8a3f..a8ec32c05e4 100644 --- a/apps/files/l10n/sk_SK.php +++ b/apps/files/l10n/sk_SK.php @@ -58,7 +58,7 @@ "New" => "Nový", "Text file" => "Textový súbor", "Folder" => "PrieÄinok", -"From url" => "Z url", +"From link" => "Z odkazu", "Upload" => "OdoslaÅ¥", "Cancel upload" => "ZruÅ¡iÅ¥ odosielanie", "Nothing in here. Upload something!" => "Žiadny súbor. Nahrajte nieÄo!", diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php index 21e1bf05253..cb240ab33a8 100644 --- a/apps/files/l10n/sl.php +++ b/apps/files/l10n/sl.php @@ -50,7 +50,6 @@ "New" => "Nova", "Text file" => "Besedilna datoteka", "Folder" => "Mapa", -"From url" => "Iz naslova URL", "Upload" => "PoÅ¡lji", "Cancel upload" => "PrekliÄi poÅ¡iljanje", "Nothing in here. Upload something!" => "Tukaj ni niÄesar. Naložite kaj!", diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php index 99e4b12697c..b61b989f33a 100644 --- a/apps/files/l10n/sr.php +++ b/apps/files/l10n/sr.php @@ -11,6 +11,7 @@ "Size" => "Величина", "Modified" => "Задња измена", "Maximum upload size" => "МакÑимална величина пошиљке", +"Save" => "Сними", "New" => "Ðови", "Text file" => "текÑтуални фајл", "Folder" => "фаÑцикла", diff --git a/apps/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php index d8c7ef18989..d5a5920b372 100644 --- a/apps/files/l10n/sr@latin.php +++ b/apps/files/l10n/sr@latin.php @@ -11,6 +11,7 @@ "Size" => "VeliÄina", "Modified" => "Zadnja izmena", "Maximum upload size" => "Maksimalna veliÄina poÅ¡iljke", +"Save" => "Snimi", "Upload" => "PoÅ¡alji", "Nothing in here. Upload something!" => "Ovde nema niÄeg. PoÅ¡aljite neÅ¡to!", "Download" => "Preuzmi", diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php index 0945145d318..eaf16242ef1 100644 --- a/apps/files/l10n/sv.php +++ b/apps/files/l10n/sv.php @@ -58,7 +58,7 @@ "New" => "Ny", "Text file" => "Textfil", "Folder" => "Mapp", -"From url" => "FrÃ¥n webbadress", +"From link" => "FrÃ¥n länk", "Upload" => "Ladda upp", "Cancel upload" => "Avbryt uppladdning", "Nothing in here. Upload something!" => "Ingenting här. Ladda upp nÃ¥got!", diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php index e1c00d05a72..6d295628139 100644 --- a/apps/files/l10n/ta_LK.php +++ b/apps/files/l10n/ta_LK.php @@ -58,7 +58,7 @@ "New" => "பà¯à®¤à®¿à®¯", "Text file" => "கோபà¯à®ªà¯ உரை", "Folder" => "கோபà¯à®ªà¯à®±à¯ˆ", -"From url" => "url இலிரà¯à®¨à¯à®¤à¯", +"From link" => "இணைபà¯à®ªà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯", "Upload" => "பதிவேறà¯à®±à¯à®•", "Cancel upload" => "பதிவேறà¯à®±à®²à¯ˆ இரதà¯à®¤à¯ செயà¯à®•", "Nothing in here. Upload something!" => "இஙà¯à®•à¯ ஒனà¯à®±à¯à®®à¯ இலà¯à®²à¯ˆ. à®à®¤à®¾à®µà®¤à¯ பதிவேறà¯à®±à¯à®•!", diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php index 9bde85229b4..2dc93d394cc 100644 --- a/apps/files/l10n/th_TH.php +++ b/apps/files/l10n/th_TH.php @@ -58,7 +58,6 @@ "New" => "à¸à¸±à¸žà¹‚หลดไฟล์ใหม่", "Text file" => "ไฟล์ข้à¸à¸„วาม", "Folder" => "à¹à¸Ÿà¹‰à¸¡à¹€à¸à¸à¸ªà¸²à¸£", -"From url" => "จาภurl", "Upload" => "à¸à¸±à¸žà¹‚หลด", "Cancel upload" => "ยà¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¸à¸±à¸žà¹‚หลด", "Nothing in here. Upload something!" => "ยังไม่มีไฟล์ใดๆà¸à¸¢à¸¹à¹ˆà¸—ี่นี่ à¸à¸£à¸¸à¸“าà¸à¸±à¸žà¹‚หลดไฟล์!", diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php index d9a619353d1..cc9485010e4 100644 --- a/apps/files/l10n/tr.php +++ b/apps/files/l10n/tr.php @@ -7,7 +7,9 @@ "Missing a temporary folder" => "Geçici bir klasör eksik", "Failed to write to disk" => "Diske yazılamadı", "Files" => "Dosyalar", +"Unshare" => "Paylaşılmayan", "Delete" => "Sil", +"Rename" => "Ä°sim deÄŸiÅŸtir.", "replace" => "deÄŸiÅŸtir", "cancel" => "iptal", "undo" => "geri al", @@ -28,10 +30,10 @@ "Enable ZIP-download" => "ZIP indirmeyi aktif et", "0 is unlimited" => "0 limitsiz demektir", "Maximum input size for ZIP files" => "ZIP dosyaları için en fazla girdi sayısı", +"Save" => "Kaydet", "New" => "Yeni", "Text file" => "Metin dosyası", "Folder" => "Klasör", -"From url" => "Url'den", "Upload" => "Yükle", "Cancel upload" => "Yüklemeyi iptal et", "Nothing in here. Upload something!" => "Burada hiçbir ÅŸey yok. BirÅŸeyler yükleyin!", diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php index 6276b6074ca..c2c3bbd21cb 100644 --- a/apps/files/l10n/uk.php +++ b/apps/files/l10n/uk.php @@ -6,6 +6,7 @@ "No file was uploaded" => "Ðе відвантажено жодного файлу", "Missing a temporary folder" => "ВідÑутній тимчаÑовий каталог", "Files" => "Файли", +"Unshare" => "Заборонити доÑтуп", "Delete" => "Видалити", "undo" => "відмінити", "generating ZIP-file, it may take some time." => "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ZIP-файлу, це може зайнÑти певний чаÑ.", @@ -17,13 +18,21 @@ "Name" => "Ім'Ñ", "Size" => "Розмір", "Modified" => "Змінено", +"seconds ago" => "Ñекунди тому", +"1 minute ago" => "1 хвилину тому", +"today" => "Ñьогодні", +"yesterday" => "вчора", +"last month" => "минулого міÑÑцÑ", +"months ago" => "міÑÑці тому", +"last year" => "минулого року", +"years ago" => "роки тому", "Maximum upload size" => "МакÑимальний розмір відвантажень", "max. possible: " => "макÑ.можливе:", "0 is unlimited" => "0 Ñ” безліміт", +"Save" => "Зберегти", "New" => "Створити", "Text file" => "ТекÑтовий файл", "Folder" => "Папка", -"From url" => "З URL", "Upload" => "Відвантажити", "Cancel upload" => "Перервати завантаженнÑ", "Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!", diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php index f933d6c7912..f152a8c989d 100644 --- a/apps/files/l10n/vi.php +++ b/apps/files/l10n/vi.php @@ -58,7 +58,6 @@ "New" => "Má»›i", "Text file" => "Táºp tin văn bản", "Folder" => "Folder", -"From url" => "Từ url", "Upload" => "Tải lên", "Cancel upload" => "Hủy upload", "Nothing in here. Upload something!" => "Không có gì ở đây .Hãy tải lên má»™t cái gì đó !", diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php index 2a52ac8096e..e68efb72024 100644 --- a/apps/files/l10n/zh_CN.GB2312.php +++ b/apps/files/l10n/zh_CN.GB2312.php @@ -27,6 +27,7 @@ "Size" => "大å°", "Modified" => "修改日期", "seconds ago" => "秒å‰", +"1 minute ago" => "1 分钟å‰", "today" => "今天", "yesterday" => "昨天", "last month" => "上个月", @@ -44,7 +45,6 @@ "New" => "新建", "Text file" => "文本文档", "Folder" => "文件夹", -"From url" => "从URL:", "Upload" => "ä¸Šä¼ ", "Cancel upload" => "å–æ¶ˆä¸Šä¼ ", "Nothing in here. Upload something!" => "这里没有东西.ä¸Šä¼ ç‚¹ä»€ä¹ˆ!", diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php index 506c3ad29c0..0046751b24c 100644 --- a/apps/files/l10n/zh_CN.php +++ b/apps/files/l10n/zh_CN.php @@ -58,7 +58,6 @@ "New" => "新建", "Text file" => "文本文件", "Folder" => "文件夹", -"From url" => "æ¥è‡ªåœ°å€", "Upload" => "ä¸Šä¼ ", "Cancel upload" => "å–æ¶ˆä¸Šä¼ ", "Nothing in here. Upload something!" => "è¿™é‡Œè¿˜ä»€ä¹ˆéƒ½æ²¡æœ‰ã€‚ä¸Šä¼ äº›ä¸œè¥¿å§ï¼", diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php index 9013a752bc2..c2792d9dfb2 100644 --- a/apps/files/l10n/zh_TW.php +++ b/apps/files/l10n/zh_TW.php @@ -7,7 +7,9 @@ "Missing a temporary folder" => "éºå¤±æš«å˜è³‡æ–™å¤¾", "Failed to write to disk" => "寫入硬碟失敗", "Files" => "檔案", +"Unshare" => "å–消共享", "Delete" => "刪除", +"Rename" => "é‡æ–°å‘½å", "replace" => "å–代", "cancel" => "å–消", "generating ZIP-file, it may take some time." => "產生壓縮檔, 它å¯èƒ½éœ€è¦ä¸€æ®µæ™‚é–“.", @@ -19,6 +21,14 @@ "Name" => "å稱", "Size" => "大å°", "Modified" => "修改", +"seconds ago" => "幾秒å‰", +"1 minute ago" => "1 分é˜å‰", +"today" => "今天", +"yesterday" => "昨天", +"last month" => "上個月", +"months ago" => "幾個月å‰", +"last year" => "去年", +"years ago" => "幾年å‰", "File handling" => "檔案處ç†", "Maximum upload size" => "最大上傳容é‡", "max. possible: " => "最大å…許: ", @@ -26,10 +36,10 @@ "Enable ZIP-download" => "啟用 Zip 下載", "0 is unlimited" => "0代表沒有é™åˆ¶", "Maximum input size for ZIP files" => "é‡å°ZIP檔案最大輸入大å°", +"Save" => "儲å˜", "New" => "新增", "Text file" => "æ–‡å—檔", "Folder" => "資料夾", -"From url" => "ç”± url ", "Upload" => "上傳", "Cancel upload" => "å–消上傳", "Nothing in here. Upload something!" => "沒有任何æ±è¥¿ã€‚請上傳內容!", diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php index c4fe4c86569..a60a1cebaf9 100644 --- a/apps/files/templates/admin.php +++ b/apps/files/templates/admin.php @@ -1,4 +1,4 @@ -<?php OCP\Util::addscript('files','admin'); ?> +<?php OCP\Util::addscript('files', 'admin'); ?> <form name="filesForm" action='#' method='post'> <fieldset class="personalblock"> @@ -11,6 +11,7 @@ <input name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php echo $_['maxZipInputSize'] ?>' title="<?php echo $l->t( '0 is unlimited' ); ?>"<?php if (!$_['allowZipDownload']) echo ' disabled="disabled"'; ?> /> <label for="maxZipInputSize"><?php echo $l->t( 'Maximum input size for ZIP files' ); ?> </label><br /> + <input type="hidden" value="<?php echo $_['requesttoken']; ?>" name="requesttoken" /> <input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings" value="<?php echo $l->t( 'Save' ); ?>"/> </fieldset> </form> diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index d49f2f4d5d3..e2640c1113c 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -8,12 +8,14 @@ <ul class="popup popupTop"> <li style="background-image:url('<?php echo OCP\mimetype_icon('text/plain') ?>')" data-type='file'><p><?php echo $l->t('Text file');?></p></li> <li style="background-image:url('<?php echo OCP\mimetype_icon('dir') ?>')" data-type='folder'><p><?php echo $l->t('Folder');?></p></li> - <li style="background-image:url('<?php echo OCP\image_path('core','actions/public.png') ?>')" data-type='web'><p><?php echo $l->t('From url');?></p></li> + <li style="background-image:url('<?php echo OCP\image_path('core', 'actions/public.png') ?>')" data-type='web'><p><?php echo $l->t('From link');?></p></li> </ul> </div> <div class="file_upload_wrapper svg"> <form data-upload-id='1' id="data-upload-form" class="file_upload_form" action="<?php echo OCP\Util::linkTo('files', 'ajax/upload.php'); ?>" method="post" enctype="multipart/form-data" target="file_upload_target_1"> <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload"> + <!-- Send the requesttoken, this is needed for older IE versions because they don't send the CSRF token via HTTP header in this case --> + <input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>" id="requesttoken"> <input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)"> <input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir"> <input class="file_upload_start" type="file" name='files[]'/> diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php index 71b695f65f8..ead9ab1ed7d 100644 --- a/apps/files/templates/part.breadcrumb.php +++ b/apps/files/templates/part.breadcrumb.php @@ -1,6 +1,6 @@ <?php for($i=0; $i<count($_["breadcrumb"]); $i++): $crumb = $_["breadcrumb"][$i]; ?> - <div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo urlencode($crumb["dir"]);?>' style='background-image:url("<?php echo OCP\image_path('core','breadcrumb.png');?>")'> + <div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo urlencode($crumb["dir"]);?>' style='background-image:url("<?php echo OCP\image_path('core', 'breadcrumb.png');?>")'> <a href="<?php echo $_['baseURL'].urlencode($crumb["dir"]); ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a> </div> <?php endfor;?> diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php index aaf9c5f57ee..4b5ac325672 100644 --- a/apps/files/templates/part.list.php +++ b/apps/files/templates/part.list.php @@ -14,10 +14,10 @@ $relative_modified_date = OCP\relative_modified_date($file['mtime']); $relative_date_color = round((time()-$file['mtime'])/60/60/24*14); // the older the file, the brighter the shade of grey; days*14 if($relative_date_color>200) $relative_date_color = 200; - $name = str_replace('+','%20', urlencode($file['name'])); - $name = str_replace('%2F','/', $name); - $directory = str_replace('+','%20', urlencode($file['directory'])); - $directory = str_replace('%2F','/', $directory); ?> + $name = str_replace('+', '%20', urlencode($file['name'])); + $name = str_replace('%2F', '/', $name); + $directory = str_replace('+', '%20', urlencode($file['directory'])); + $directory = str_replace('%2F', '/', $directory); ?> <tr data-id="<?php echo $file['id']; ?>" data-file="<?php echo $name;?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mimetype']?>" data-size='<?php echo $file['size'];?>' data-permissions='<?php echo $file['permissions']; ?>'> <td class="filename svg" style="background-image:url(<?php if($file['type'] == 'dir') echo OCP\mimetype_icon('dir'); else echo OCP\mimetype_icon($file['mimetype']); ?>)"> <?php if(!isset($_['readonly']) || !$_['readonly']) { ?><input type="checkbox" /><?php } ?> diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php index bb130a366be..3f76e910a52 100644 --- a/apps/files_encryption/appinfo/app.php +++ b/apps/files_encryption/appinfo/app.php @@ -6,9 +6,9 @@ OC::$CLASSPATH['OC_FileProxy_Encryption'] = 'apps/files_encryption/lib/proxy.php OC_FileProxy::register(new OC_FileProxy_Encryption()); -OCP\Util::connectHook('OC_User','post_login','OC_Crypt','loginListener'); +OCP\Util::connectHook('OC_User', 'post_login', 'OC_Crypt', 'loginListener'); -stream_wrapper_register('crypt','OC_CryptStream'); +stream_wrapper_register('crypt', 'OC_CryptStream'); if(!isset($_SESSION['enckey']) and OCP\User::isLoggedIn()) {//force the user to re-loggin if the encryption key isn't unlocked (happens when a user is logged in before the encryption app is enabled) OCP\User::logout(); diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php index d057c1ed194..5ff3f578384 100644 --- a/apps/files_encryption/lib/crypt.php +++ b/apps/files_encryption/lib/crypt.php @@ -40,10 +40,10 @@ class OC_Crypt { static private $bf = null; public static function loginListener($params) { - self::init($params['uid'],$params['password']); + self::init($params['uid'], $params['password']); } - public static function init($login,$password) { + public static function init($login, $password) { $view=new OC_FilesystemView('/'); if(!$view->file_exists('/'.$login)) { $view->mkdir('/'.$login); @@ -51,7 +51,7 @@ class OC_Crypt { OC_FileProxy::$enabled=false; if(!$view->file_exists('/'.$login.'/encryption.key')) {// does key exist? - OC_Crypt::createkey($login,$password); + OC_Crypt::createkey($login, $password); } $key=$view->file_get_contents('/'.$login.'/encryption.key'); OC_FileProxy::$enabled=true; @@ -80,18 +80,18 @@ class OC_Crypt { } } - public static function createkey($username,$passcode) { + public static function createkey($username, $passcode) { // generate a random key - $key=mt_rand(10000,99999).mt_rand(10000,99999).mt_rand(10000,99999).mt_rand(10000,99999); + $key=mt_rand(10000, 99999).mt_rand(10000, 99999).mt_rand(10000, 99999).mt_rand(10000, 99999); // encrypt the key with the passcode of the user - $enckey=OC_Crypt::encrypt($key,$passcode); + $enckey=OC_Crypt::encrypt($key, $passcode); // Write the file $proxyEnabled=OC_FileProxy::$enabled; OC_FileProxy::$enabled=false; $view=new OC_FilesystemView('/'.$username); - $view->file_put_contents('/encryption.key',$enckey); + $view->file_put_contents('/encryption.key', $enckey); OC_FileProxy::$enabled=$proxyEnabled; } @@ -195,8 +195,8 @@ class OC_Crypt { public static function blockEncrypt($data, $key='') { $result=''; while(strlen($data)) { - $result.=self::encrypt(substr($data,0,8192),$key); - $data=substr($data,8192); + $result.=self::encrypt(substr($data, 0, 8192), $key); + $data=substr($data, 8192); } return $result; } @@ -204,14 +204,14 @@ class OC_Crypt { /** * decrypt data in 8192b sized blocks */ - public static function blockDecrypt($data, $key='',$maxLength=0) { + public static function blockDecrypt($data, $key='', $maxLength=0) { $result=''; while(strlen($data)) { - $result.=self::decrypt(substr($data,0,8192),$key); - $data=substr($data,8192); + $result.=self::decrypt(substr($data, 0, 8192), $key); + $data=substr($data, 8192); } if($maxLength>0) { - return substr($result,0,$maxLength); + return substr($result, 0, $maxLength); }else{ return rtrim($result, "\0"); } diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php index 95b58b8cce7..8b05560050d 100644 --- a/apps/files_encryption/lib/cryptstream.php +++ b/apps/files_encryption/lib/cryptstream.php @@ -23,7 +23,7 @@ /** * transparently encrypted filestream * - * you can use it as wrapper around an existing stream by setting OC_CryptStream::$sourceStreams['foo']=array('path'=>$path,'stream'=>$stream) + * you can use it as wrapper around an existing stream by setting OC_CryptStream::$sourceStreams['foo']=array('path'=>$path, 'stream'=>$stream) * and then fopen('crypt://streams/foo'); */ @@ -40,7 +40,7 @@ class OC_CryptStream{ if(!self::$rootView) { self::$rootView=new OC_FilesystemView(''); } - $path=str_replace('crypt://','',$path); + $path=str_replace('crypt://', '', $path); if(dirname($path)=='streams' and isset(self::$sourceStreams[basename($path)])) { $this->source=self::$sourceStreams[basename($path)]['stream']; $this->path=self::$sourceStreams[basename($path)]['path']; @@ -50,13 +50,13 @@ class OC_CryptStream{ if($mode=='w' or $mode=='w+' or $mode=='wb' or $mode=='wb+') { $this->size=0; }else{ - $this->size=self::$rootView->filesize($path,$mode); + $this->size=self::$rootView->filesize($path, $mode); } OC_FileProxy::$enabled=false;//disable fileproxies so we can open the source file - $this->source=self::$rootView->fopen($path,$mode); + $this->source=self::$rootView->fopen($path, $mode); OC_FileProxy::$enabled=true; if(!is_resource($this->source)) { - OCP\Util::writeLog('files_encryption','failed to open '.$path,OCP\Util::ERROR); + OCP\Util::writeLog('files_encryption', 'failed to open '.$path, OCP\Util::ERROR); } } if(is_resource($this->source)) { @@ -67,7 +67,7 @@ class OC_CryptStream{ public function stream_seek($offset, $whence=SEEK_SET) { $this->flush(); - fseek($this->source,$offset,$whence); + fseek($this->source, $offset, $whence); } public function stream_tell() { @@ -79,11 +79,11 @@ class OC_CryptStream{ //This makes this function a lot simpler but will breake everything the moment it's fixed $this->writeCache=''; if($count!=8192) { - OCP\Util::writeLog('files_encryption','php bug 21641 no longer holds, decryption will not work',OCP\Util::FATAL); + OCP\Util::writeLog('files_encryption', 'php bug 21641 no longer holds, decryption will not work', OCP\Util::FATAL); die(); } $pos=ftell($this->source); - $data=fread($this->source,8192); + $data=fread($this->source, 8192); if(strlen($data)) { $result=OC_Crypt::decrypt($data); }else{ @@ -91,7 +91,7 @@ class OC_CryptStream{ } $length=$this->size-$pos; if($length<8192) { - $result=substr($result,0,$length); + $result=substr($result, 0, $length); } return $result; } @@ -105,12 +105,12 @@ class OC_CryptStream{ } if($currentPos%8192!=0) { //make sure we always start on a block start - fseek($this->source,-($currentPos%8192),SEEK_CUR); - $encryptedBlock=fread($this->source,8192); - fseek($this->source,-($currentPos%8192),SEEK_CUR); + fseek($this->source, -($currentPos%8192), SEEK_CUR); + $encryptedBlock=fread($this->source, 8192); + fseek($this->source, -($currentPos%8192), SEEK_CUR); $block=OC_Crypt::decrypt($encryptedBlock); - $data=substr($block,0,$currentPos%8192).$data; - fseek($this->source,-($currentPos%8192),SEEK_CUR); + $data=substr($block, 0, $currentPos%8192).$data; + fseek($this->source, -($currentPos%8192), SEEK_CUR); } $currentPos=ftell($this->source); while($remainingLength=strlen($data)>0) { @@ -118,25 +118,25 @@ class OC_CryptStream{ $this->writeCache=$data; $data=''; }else{ - $encrypted=OC_Crypt::encrypt(substr($data,0,8192)); - fwrite($this->source,$encrypted); - $data=substr($data,8192); + $encrypted=OC_Crypt::encrypt(substr($data, 0, 8192)); + fwrite($this->source, $encrypted); + $data=substr($data, 8192); } } - $this->size=max($this->size,$currentPos+$length); + $this->size=max($this->size, $currentPos+$length); return $length; } - public function stream_set_option($option,$arg1,$arg2) { + public function stream_set_option($option, $arg1, $arg2) { switch($option) { case STREAM_OPTION_BLOCKING: - stream_set_blocking($this->source,$arg1); + stream_set_blocking($this->source, $arg1); break; case STREAM_OPTION_READ_TIMEOUT: - stream_set_timeout($this->source,$arg1,$arg2); + stream_set_timeout($this->source, $arg1, $arg2); break; case STREAM_OPTION_WRITE_BUFFER: - stream_set_write_buffer($this->source,$arg1,$arg2); + stream_set_write_buffer($this->source, $arg1, $arg2); } } @@ -145,7 +145,7 @@ class OC_CryptStream{ } public function stream_lock($mode) { - flock($this->source,$mode); + flock($this->source, $mode); } public function stream_flush() { @@ -159,7 +159,7 @@ class OC_CryptStream{ private function flush() { if($this->writeCache) { $encrypted=OC_Crypt::encrypt($this->writeCache); - fwrite($this->source,$encrypted); + fwrite($this->source, $encrypted); $this->writeCache=''; } } @@ -167,7 +167,7 @@ class OC_CryptStream{ public function stream_close() { $this->flush(); if($this->meta['mode']!='r' and $this->meta['mode']!='rb') { - OC_FileCache::put($this->path, array('encrypted'=>true,'size'=>$this->size),''); + OC_FileCache::put($this->path, array('encrypted'=>true, 'size'=>$this->size), ''); } return fclose($this->source); } diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index 61b87ab5463..4a390013d20 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -36,7 +36,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{ */ private static function shouldEncrypt($path) { if(is_null(self::$enableEncryption)) { - self::$enableEncryption=(OCP\Config::getAppValue('files_encryption','enable_encryption','true')=='true'); + self::$enableEncryption=(OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true')=='true'); } if(!self::$enableEncryption) { return false; @@ -59,7 +59,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{ * @return bool */ private static function isEncrypted($path) { - $metadata=OC_FileCache_Cached::get($path,''); + $metadata=OC_FileCache_Cached::get($path, ''); return isset($metadata['encrypted']) and (bool)$metadata['encrypted']; } @@ -68,15 +68,15 @@ class OC_FileProxy_Encryption extends OC_FileProxy{ if (!is_resource($data)) {//stream put contents should have been converter to fopen $size=strlen($data); $data=OC_Crypt::blockEncrypt($data); - OC_FileCache::put($path, array('encrypted'=>true,'size'=>$size),''); + OC_FileCache::put($path, array('encrypted'=>true,'size'=>$size), ''); } } } - public function postFile_get_contents($path,$data) { + public function postFile_get_contents($path, $data) { if(self::isEncrypted($path)) { - $cached=OC_FileCache_Cached::get($path,''); - $data=OC_Crypt::blockDecrypt($data,'',$cached['size']); + $cached=OC_FileCache_Cached::get($path, ''); + $data=OC_Crypt::blockDecrypt($data, '', $cached['size']); } return $data; } @@ -88,40 +88,40 @@ class OC_FileProxy_Encryption extends OC_FileProxy{ $meta=stream_get_meta_data($result); if(self::isEncrypted($path)) { fclose($result); - $result=fopen('crypt://'.$path,$meta['mode']); + $result=fopen('crypt://'.$path, $meta['mode']); }elseif(self::shouldEncrypt($path) and $meta['mode']!='r' and $meta['mode']!='rb') { if(OC_Filesystem::file_exists($path) and OC_Filesystem::filesize($path)>0) { //first encrypt the target file so we don't end up with a half encrypted file - OCP\Util::writeLog('files_encryption','Decrypting '.$path.' before writing',OCP\Util::DEBUG); + OCP\Util::writeLog('files_encryption', 'Decrypting '.$path.' before writing', OCP\Util::DEBUG); $tmp=fopen('php://temp'); - OCP\Files::streamCopy($result,$tmp); + OCP\Files::streamCopy($result, $tmp); fclose($result); - OC_Filesystem::file_put_contents($path,$tmp); + OC_Filesystem::file_put_contents($path, $tmp); fclose($tmp); } - $result=fopen('crypt://'.$path,$meta['mode']); + $result=fopen('crypt://'.$path, $meta['mode']); } return $result; } - public function postGetMimeType($path,$mime) { + public function postGetMimeType($path, $mime) { if(self::isEncrypted($path)) { - $mime=OCP\Files::getMimeType('crypt://'.$path,'w'); + $mime=OCP\Files::getMimeType('crypt://'.$path, 'w'); } return $mime; } - public function postStat($path,$data) { + public function postStat($path, $data) { if(self::isEncrypted($path)) { - $cached=OC_FileCache_Cached::get($path,''); + $cached=OC_FileCache_Cached::get($path, ''); $data['size']=$cached['size']; } return $data; } - public function postFileSize($path,$size) { + public function postFileSize($path, $size) { if(self::isEncrypted($path)) { - $cached=OC_FileCache_Cached::get($path,''); + $cached=OC_FileCache_Cached::get($path, ''); return $cached['size']; }else{ return $size; diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php index 168124a8d22..ae28b088cd6 100644 --- a/apps/files_encryption/settings.php +++ b/apps/files_encryption/settings.php @@ -8,11 +8,11 @@ $tmpl = new OCP\Template( 'files_encryption', 'settings'); $blackList=explode(',', OCP\Config::getAppValue('files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg')); -$enabled=(OCP\Config::getAppValue('files_encryption','enable_encryption','true')=='true'); -$tmpl->assign('blacklist',$blackList); -$tmpl->assign('encryption_enabled',$enabled); +$enabled=(OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true')=='true'); +$tmpl->assign('blacklist', $blackList); +$tmpl->assign('encryption_enabled', $enabled); -OCP\Util::addscript('files_encryption','settings'); -OCP\Util::addscript('core','multiselect'); +OCP\Util::addscript('files_encryption', 'settings'); +OCP\Util::addscript('core', 'multiselect'); return $tmpl->fetchPage(); diff --git a/apps/files_encryption/tests/encryption.php b/apps/files_encryption/tests/encryption.php index a7bc2df0e12..0e119f55bea 100644 --- a/apps/files_encryption/tests/encryption.php +++ b/apps/files_encryption/tests/encryption.php @@ -11,46 +11,46 @@ class Test_Encryption extends UnitTestCase { $key=uniqid(); $file=OC::$SERVERROOT.'/3rdparty/MDB2.php'; $source=file_get_contents($file); //nice large text file - $encrypted=OC_Crypt::encrypt($source,$key); - $decrypted=OC_Crypt::decrypt($encrypted,$key); + $encrypted=OC_Crypt::encrypt($source, $key); + $decrypted=OC_Crypt::decrypt($encrypted, $key); $decrypted=rtrim($decrypted, "\0"); - $this->assertNotEqual($encrypted,$source); - $this->assertEqual($decrypted,$source); + $this->assertNotEqual($encrypted, $source); + $this->assertEqual($decrypted, $source); - $chunk=substr($source,0,8192); - $encrypted=OC_Crypt::encrypt($chunk,$key); + $chunk=substr($source, 0, 8192); + $encrypted=OC_Crypt::encrypt($chunk, $key); $this->assertEqual(strlen($chunk), strlen($encrypted)); - $decrypted=OC_Crypt::decrypt($encrypted,$key); + $decrypted=OC_Crypt::decrypt($encrypted, $key); $decrypted=rtrim($decrypted, "\0"); - $this->assertEqual($decrypted,$chunk); + $this->assertEqual($decrypted, $chunk); - $encrypted=OC_Crypt::blockEncrypt($source,$key); - $decrypted=OC_Crypt::blockDecrypt($encrypted,$key); - $this->assertNotEqual($encrypted,$source); - $this->assertEqual($decrypted,$source); + $encrypted=OC_Crypt::blockEncrypt($source, $key); + $decrypted=OC_Crypt::blockDecrypt($encrypted, $key); + $this->assertNotEqual($encrypted, $source); + $this->assertEqual($decrypted, $source); $tmpFileEncrypted=OCP\Files::tmpFile(); - OC_Crypt::encryptfile($file,$tmpFileEncrypted,$key); + OC_Crypt::encryptfile($file, $tmpFileEncrypted, $key); $encrypted=file_get_contents($tmpFileEncrypted); - $decrypted=OC_Crypt::blockDecrypt($encrypted,$key); - $this->assertNotEqual($encrypted,$source); - $this->assertEqual($decrypted,$source); + $decrypted=OC_Crypt::blockDecrypt($encrypted, $key); + $this->assertNotEqual($encrypted, $source); + $this->assertEqual($decrypted, $source); $tmpFileDecrypted=OCP\Files::tmpFile(); - OC_Crypt::decryptfile($tmpFileEncrypted,$tmpFileDecrypted,$key); + OC_Crypt::decryptfile($tmpFileEncrypted, $tmpFileDecrypted, $key); $decrypted=file_get_contents($tmpFileDecrypted); - $this->assertEqual($decrypted,$source); + $this->assertEqual($decrypted, $source); $file=OC::$SERVERROOT.'/core/img/weather-clear.png'; $source=file_get_contents($file); //binary file - $encrypted=OC_Crypt::encrypt($source,$key); - $decrypted=OC_Crypt::decrypt($encrypted,$key); + $encrypted=OC_Crypt::encrypt($source, $key); + $decrypted=OC_Crypt::decrypt($encrypted, $key); $decrypted=rtrim($decrypted, "\0"); - $this->assertEqual($decrypted,$source); + $this->assertEqual($decrypted, $source); - $encrypted=OC_Crypt::blockEncrypt($source,$key); - $decrypted=OC_Crypt::blockDecrypt($encrypted,$key); - $this->assertEqual($decrypted,$source); + $encrypted=OC_Crypt::blockEncrypt($source, $key); + $decrypted=OC_Crypt::blockDecrypt($encrypted, $key); + $this->assertEqual($decrypted, $source); } @@ -59,14 +59,14 @@ class Test_Encryption extends UnitTestCase { $file=__DIR__.'/binary'; $source=file_get_contents($file); //binary file - $encrypted=OC_Crypt::encrypt($source,$key); - $decrypted=OC_Crypt::decrypt($encrypted,$key); + $encrypted=OC_Crypt::encrypt($source, $key); + $decrypted=OC_Crypt::decrypt($encrypted, $key); $decrypted=rtrim($decrypted, "\0"); - $this->assertEqual($decrypted,$source); + $this->assertEqual($decrypted, $source); - $encrypted=OC_Crypt::blockEncrypt($source,$key); - $decrypted=OC_Crypt::blockDecrypt($encrypted,$key, strlen($source)); - $this->assertEqual($decrypted,$source); + $encrypted=OC_Crypt::blockEncrypt($source, $key); + $decrypted=OC_Crypt::blockDecrypt($encrypted, $key, strlen($source)); + $this->assertEqual($decrypted, $source); } } diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php index c3c8f4a2db0..1c800bbc5f6 100644 --- a/apps/files_encryption/tests/proxy.php +++ b/apps/files_encryption/tests/proxy.php @@ -13,8 +13,8 @@ class Test_CryptProxy extends UnitTestCase { public function setUp() { $user=OC_User::getUser(); - $this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption','true'); - OCP\Config::setAppValue('files_encryption','enable_encryption','true'); + $this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption', 'true'); + OCP\Config::setAppValue('files_encryption', 'enable_encryption', 'true'); $this->oldKey=isset($_SESSION['enckey'])?$_SESSION['enckey']:null; @@ -30,7 +30,7 @@ class Test_CryptProxy extends UnitTestCase { //set up temporary storage OC_Filesystem::clearMounts(); - OC_Filesystem::mount('OC_Filestorage_Temporary', array(),'/'); + OC_Filesystem::mount('OC_Filestorage_Temporary', array(), '/'); OC_Filesystem::init('/'.$user.'/files'); @@ -41,7 +41,7 @@ class Test_CryptProxy extends UnitTestCase { } public function tearDown() { - OCP\Config::setAppValue('files_encryption','enable_encryption',$this->oldConfig); + OCP\Config::setAppValue('files_encryption', 'enable_encryption', $this->oldConfig); if(!is_null($this->oldKey)) { $_SESSION['enckey']=$this->oldKey; } @@ -51,16 +51,16 @@ class Test_CryptProxy extends UnitTestCase { $file=OC::$SERVERROOT.'/3rdparty/MDB2.php'; $original=file_get_contents($file); - OC_Filesystem::file_put_contents('/file',$original); + OC_Filesystem::file_put_contents('/file', $original); OC_FileProxy::$enabled=false; $stored=OC_Filesystem::file_get_contents('/file'); OC_FileProxy::$enabled=true; $fromFile=OC_Filesystem::file_get_contents('/file'); - $this->assertNotEqual($original,$stored); + $this->assertNotEqual($original, $stored); $this->assertEqual(strlen($original), strlen($fromFile)); - $this->assertEqual($original,$fromFile); + $this->assertEqual($original, $fromFile); } @@ -72,46 +72,46 @@ class Test_CryptProxy extends UnitTestCase { $view=new OC_FilesystemView('/'.OC_User::getUser()); $userDir='/'.OC_User::getUser().'/files'; - $rootView->file_put_contents($userDir.'/file',$original); + $rootView->file_put_contents($userDir.'/file', $original); OC_FileProxy::$enabled=false; $stored=$rootView->file_get_contents($userDir.'/file'); OC_FileProxy::$enabled=true; - $this->assertNotEqual($original,$stored); + $this->assertNotEqual($original, $stored); $fromFile=$rootView->file_get_contents($userDir.'/file'); - $this->assertEqual($original,$fromFile); + $this->assertEqual($original, $fromFile); $fromFile=$view->file_get_contents('files/file'); - $this->assertEqual($original,$fromFile); + $this->assertEqual($original, $fromFile); } public function testBinary() { $file=__DIR__.'/binary'; $original=file_get_contents($file); - OC_Filesystem::file_put_contents('/file',$original); + OC_Filesystem::file_put_contents('/file', $original); OC_FileProxy::$enabled=false; $stored=OC_Filesystem::file_get_contents('/file'); OC_FileProxy::$enabled=true; $fromFile=OC_Filesystem::file_get_contents('/file'); - $this->assertNotEqual($original,$stored); + $this->assertNotEqual($original, $stored); $this->assertEqual(strlen($original), strlen($fromFile)); - $this->assertEqual($original,$fromFile); + $this->assertEqual($original, $fromFile); $file=__DIR__.'/zeros'; $original=file_get_contents($file); - OC_Filesystem::file_put_contents('/file',$original); + OC_Filesystem::file_put_contents('/file', $original); OC_FileProxy::$enabled=false; $stored=OC_Filesystem::file_get_contents('/file'); OC_FileProxy::$enabled=true; $fromFile=OC_Filesystem::file_get_contents('/file'); - $this->assertNotEqual($original,$stored); + $this->assertNotEqual($original, $stored); $this->assertEqual(strlen($original), strlen($fromFile)); } } diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php index 5ea0da48017..67b5e98ae67 100644 --- a/apps/files_encryption/tests/stream.php +++ b/apps/files_encryption/tests/stream.php @@ -10,27 +10,27 @@ class Test_CryptStream extends UnitTestCase { private $tmpFiles=array(); function testStream() { - $stream=$this->getStream('test1','w', strlen('foobar')); - fwrite($stream,'foobar'); + $stream=$this->getStream('test1', 'w', strlen('foobar')); + fwrite($stream, 'foobar'); fclose($stream); - $stream=$this->getStream('test1','r', strlen('foobar')); - $data=fread($stream,6); + $stream=$this->getStream('test1', 'r', strlen('foobar')); + $data=fread($stream, 6); fclose($stream); - $this->assertEqual('foobar',$data); + $this->assertEqual('foobar', $data); $file=OC::$SERVERROOT.'/3rdparty/MDB2.php'; - $source=fopen($file,'r'); - $target=$this->getStream('test2','w',0); - OCP\Files::streamCopy($source,$target); + $source=fopen($file, 'r'); + $target=$this->getStream('test2', 'w', 0); + OCP\Files::streamCopy($source, $target); fclose($target); fclose($source); - $stream=$this->getStream('test2','r', filesize($file)); + $stream=$this->getStream('test2', 'r', filesize($file)); $data=stream_get_contents($stream); $original=file_get_contents($file); $this->assertEqual(strlen($original), strlen($data)); - $this->assertEqual($original,$data); + $this->assertEqual($original, $data); } /** @@ -40,7 +40,7 @@ class Test_CryptStream extends UnitTestCase { * @param int size * @return resource */ - function getStream($id,$mode,$size) { + function getStream($id, $mode, $size) { if($id==='') { $id=uniqid(); } @@ -50,36 +50,36 @@ class Test_CryptStream extends UnitTestCase { }else{ $file=$this->tmpFiles[$id]; } - $stream=fopen($file,$mode); - OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id,'stream'=>$stream,'size'=>$size); - return fopen('crypt://streams/'.$id,$mode); + $stream=fopen($file, $mode); + OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id, 'stream'=>$stream, 'size'=>$size); + return fopen('crypt://streams/'.$id, $mode); } function testBinary() { $file=__DIR__.'/binary'; $source=file_get_contents($file); - $stream=$this->getStream('test','w', strlen($source)); - fwrite($stream,$source); + $stream=$this->getStream('test', 'w', strlen($source)); + fwrite($stream, $source); fclose($stream); - $stream=$this->getStream('test','r', strlen($source)); + $stream=$this->getStream('test', 'r', strlen($source)); $data=stream_get_contents($stream); fclose($stream); $this->assertEqual(strlen($data), strlen($source)); - $this->assertEqual($source,$data); + $this->assertEqual($source, $data); $file=__DIR__.'/zeros'; $source=file_get_contents($file); - $stream=$this->getStream('test2','w', strlen($source)); - fwrite($stream,$source); + $stream=$this->getStream('test2', 'w', strlen($source)); + fwrite($stream, $source); fclose($stream); - $stream=$this->getStream('test2','r', strlen($source)); + $stream=$this->getStream('test2', 'r', strlen($source)); $data=stream_get_contents($stream); fclose($stream); $this->assertEqual(strlen($data), strlen($source)); - $this->assertEqual($source,$data); + $this->assertEqual($source, $data); } } diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php index 51951c19bfd..8006be1a2f5 100644 --- a/apps/files_external/l10n/cs_CZ.php +++ b/apps/files_external/l10n/cs_CZ.php @@ -10,7 +10,7 @@ "Backend" => "Podpůrná vrstva", "Configuration" => "NastavenÃ", "Options" => "Možnosti", -"Applicable" => "Platný", +"Applicable" => "PÅ™Ãstupný pro", "Add mount point" => "PÅ™idat bod pÅ™ipojenÃ", "None set" => "Nenastaveno", "All Users" => "VÅ¡ichni uživatelé", diff --git a/apps/files_external/l10n/lt_LT.php b/apps/files_external/l10n/lt_LT.php index 6cd3ca2bbfd..cdb168dd385 100644 --- a/apps/files_external/l10n/lt_LT.php +++ b/apps/files_external/l10n/lt_LT.php @@ -1,6 +1,6 @@ <?php $TRANSLATIONS = array( "Access granted" => "PriÄ—jimas suteiktas", -"Error configuring Dropbox storage" => "Klaida nustatinÄ—jantDropbox talpyklÄ…", +"Error configuring Dropbox storage" => "Klaida nustatinÄ—jant Dropbox talpyklÄ…", "Grant access" => "Suteikti priÄ—jimÄ…", "Fill out all required fields" => "Užpildykite visus reikalingus laukelius", "Please provide a valid Dropbox app key and secret." => "PraÅ¡ome įvesti teisingus Dropbox \"app key\" ir \"secret\".", diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 9dc3cdd7147..fdc847fcf2c 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -256,7 +256,7 @@ class OC_Mount_Config { foreach ($data[self::MOUNT_TYPE_GROUP] as $group => $mounts) { $content .= "\t\t'".$group."' => array (\n"; foreach ($mounts as $mountPoint => $mount) { - $content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).",\n"; + $content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).", \n"; } $content .= "\t\t),\n"; @@ -285,7 +285,12 @@ class OC_Mount_Config { public static function getCertificates() { $view = \OCP\Files::getStorage('files_external'); $path=\OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("").'uploads/'; - if (!is_dir($path)) mkdir($path); + \OCP\Util::writeLog('files_external', 'checking path '.$path, \OCP\Util::INFO); + if(!is_dir($path)) { + //path might not exist (e.g. non-standard OC_User::getHome() value) + //in this case create full path using 3rd (recursive=true) parameter. + mkdir($path, 0777, true); + } $result = array(); $handle = opendir($path); if (!$handle) { diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php index 13d1387f287..650ca88fd93 100644 --- a/apps/files_external/lib/ftp.php +++ b/apps/files_external/lib/ftp.php @@ -19,7 +19,15 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{ $this->host=$params['host']; $this->user=$params['user']; $this->password=$params['password']; - $this->secure=isset($params['secure'])?(bool)$params['secure']:false; + if(isset($params['secure'])){ + if(is_string($params['secure'])){ + $this->secure = ($params['secure'] === 'true'); + }else{ + $this->secure = (bool)$params['secure']; + } + }else{ + $this->secure = false; + } $this->root=isset($params['root'])?$params['root']:'/'; if(!$this->root || $this->root[0]!='/') { $this->root='/'.$this->root; @@ -43,7 +51,7 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{ $url.='://'.$this->user.':'.$this->password.'@'.$this->host.$this->root.$path; return $url; } - public function fopen($path,$mode) { + public function fopen($path, $mode) { switch($mode) { case 'r': case 'rb': @@ -53,7 +61,7 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{ case 'ab': //these are supported by the wrapper $context = stream_context_create(array('ftp' => array('overwrite' => true))); - return fopen($this->constructUrl($path),$mode, false,$context); + return fopen($this->constructUrl($path), $mode, false, $context); case 'r+': case 'w+': case 'wb+': @@ -63,18 +71,18 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{ case 'c': case 'c+': //emulate these - if(strrpos($path,'.')!==false) { - $ext=substr($path, strrpos($path,'.')); + if(strrpos($path, '.')!==false) { + $ext=substr($path, strrpos($path, '.')); }else{ $ext=''; } $tmpFile=OCP\Files::tmpFile($ext); - OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack'); + OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this, 'writeBack'); if($this->file_exists($path)) { - $this->getFile($path,$tmpFile); + $this->getFile($path, $tmpFile); } self::$tempFiles[$tmpFile]=$path; - return fopen('close://'.$tmpFile,$mode); + return fopen('close://'.$tmpFile, $mode); } } diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php index 32d57ed3cef..e5de81280ac 100644 --- a/apps/files_external/lib/google.php +++ b/apps/files_external/lib/google.php @@ -394,8 +394,8 @@ class OC_Filestorage_Google extends OC_Filestorage_Common { case 'x+': case 'c': case 'c+': - if (strrpos($path,'.') !== false) { - $ext = substr($path, strrpos($path,'.')); + if (strrpos($path, '.') !== false) { + $ext = substr($path, strrpos($path, '.')); } else { $ext = ''; } diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php index eed2582dc99..802d80d8d1f 100644 --- a/apps/files_external/lib/smb.php +++ b/apps/files_external/lib/smb.php @@ -24,14 +24,14 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{ if(!$this->root || $this->root[0]!='/') { $this->root='/'.$this->root; } - if(substr($this->root,-1,1)!='/') { + if(substr($this->root, -1, 1)!='/') { $this->root.='/'; } if(!$this->share || $this->share[0]!='/') { $this->share='/'.$this->share; } - if(substr($this->share,-1,1)=='/') { - $this->share=substr($this->share,0,-1); + if(substr($this->share, -1, 1)=='/') { + $this->share=substr($this->share, 0, -1); } //create the root folder if necesary @@ -41,8 +41,8 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{ } public function constructUrl($path) { - if(substr($path,-1)=='/') { - $path=substr($path,0,-1); + if(substr($path, -1)=='/') { + $path=substr($path, 0, -1); } return 'smb://'.$this->user.':'.$this->password.'@'.$this->host.$this->share.$this->root.$path; } @@ -67,7 +67,7 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{ * @param int $time * @return bool */ - public function hasUpdated($path,$time) { + public function hasUpdated($path, $time) { if(!$path and $this->root=='/') { //mtime doesn't work for shares, but giving the nature of the backend, doing a full update is still just fast enough return true; diff --git a/apps/files_external/lib/streamwrapper.php b/apps/files_external/lib/streamwrapper.php index 7263ef23253..b66a0f0ee1b 100644 --- a/apps/files_external/lib/streamwrapper.php +++ b/apps/files_external/lib/streamwrapper.php @@ -50,34 +50,34 @@ abstract class OC_FileStorage_StreamWrapper extends OC_Filestorage_Common{ return $succes; } - public function fopen($path,$mode) { - return fopen($this->constructUrl($path),$mode); + public function fopen($path, $mode) { + return fopen($this->constructUrl($path), $mode); } public function free_space($path) { return 0; } - public function touch($path,$mtime=null) { + public function touch($path, $mtime=null) { if(is_null($mtime)) { - $fh=$this->fopen($path,'a'); - fwrite($fh,''); + $fh=$this->fopen($path, 'a'); + fwrite($fh, ''); fclose($fh); }else{ return false;//not supported } } - public function getFile($path,$target) { - return copy($this->constructUrl($path),$target); + public function getFile($path, $target) { + return copy($this->constructUrl($path), $target); } - public function uploadFile($path,$target) { - return copy($path,$this->constructUrl($target)); + public function uploadFile($path, $target) { + return copy($path, $this->constructUrl($target)); } - public function rename($path1,$path2) { - return rename($this->constructUrl($path1),$this->constructUrl($path2)); + public function rename($path1, $path2) { + return rename($this->constructUrl($path1), $this->constructUrl($path2)); } public function stat($path) { diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php index 632c72c280f..9c9754ac346 100644 --- a/apps/files_external/lib/swift.php +++ b/apps/files_external/lib/swift.php @@ -39,8 +39,8 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ * @return string */ private function getContainerName($path) { - $path=trim(trim($this->root,'/')."/".$path,'/.'); - return str_replace('/','\\',$path); + $path=trim(trim($this->root, '/')."/".$path, '/.'); + return str_replace('/', '\\', $path); } /** @@ -189,7 +189,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ * @param string name * @return bool */ - private function addSubContainer($container,$name) { + private function addSubContainer($container, $name) { if(!$name) { return false; } @@ -201,16 +201,16 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ foreach($containers as &$sub) { $sub=trim($sub); } - if(array_search($name,$containers)!==false) { + if(array_search($name, $containers)!==false) { unlink($tmpFile); return false; }else{ - $fh=fopen($tmpFile,'a'); - fwrite($fh,$name."\n"); + $fh=fopen($tmpFile, 'a'); + fwrite($fh, $name."\n"); } }catch(Exception $e) { $containers=array(); - file_put_contents($tmpFile,$name."\n"); + file_put_contents($tmpFile, $name."\n"); } $obj->load_from_filename($tmpFile); @@ -224,7 +224,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ * @param string name * @return bool */ - private function removeSubContainer($container,$name) { + private function removeSubContainer($container, $name) { if(!$name) { return false; } @@ -239,13 +239,13 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ foreach($containers as &$sub) { $sub=trim($sub); } - $i=array_search($name,$containers); + $i=array_search($name, $containers); if($i===false) { unlink($tmpFile); return false; }else{ unset($containers[$i]); - file_put_contents($tmpFile, implode("\n",$containers)."\n"); + file_put_contents($tmpFile, implode("\n", $containers)."\n"); } $obj->load_from_filename($tmpFile); @@ -271,7 +271,15 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ $this->host=$params['host']; $this->user=$params['user']; $this->root=isset($params['root'])?$params['root']:'/'; - $this->secure=isset($params['secure'])?(bool)$params['secure']:true; + if(isset($params['secure'])){ + if(is_string($params['secure'])){ + $this->secure = ($params['secure'] === 'true'); + }else{ + $this->secure = (bool)$params['secure']; + } + }else{ + $this->secure = false; + } if(!$this->root || $this->root[0]!='/') { $this->root='/'.$this->root; } @@ -337,12 +345,12 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ public function opendir($path) { $container=$this->getContainer($path); $files=$this->getObjects($container); - $i=array_search(self::SUBCONTAINER_FILE,$files); + $i=array_search(self::SUBCONTAINER_FILE, $files); if($i!==false) { unset($files[$i]); } $subContainers=$this->getSubContainers($container); - $files=array_merge($files,$subContainers); + $files=array_merge($files, $subContainers); $id=$this->getContainerName($path); OC_FakeDirStream::$dirs[$id]=$files; return opendir('fakedir://'.$id); @@ -380,7 +388,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ return $obj->read(); } - public function file_put_contents($path,$content) { + public function file_put_contents($path, $content) { $obj=$this->getObject($path); if(is_null($obj)) { $container=$this->getContainer(dirname($path)); @@ -406,7 +414,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ } } - public function fopen($path,$mode) { + public function fopen($path, $mode) { switch($mode) { case 'r': case 'rb': @@ -432,9 +440,9 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ case 'c': case 'c+': $tmpFile=$this->getTmpFile($path); - OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack'); + OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this, 'writeBack'); self::$tempFiles[$tmpFile]=$path; - return fopen('close://'.$tmpFile,$mode); + return fopen('close://'.$tmpFile, $mode); } } @@ -449,7 +457,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ return 1024*1024*1024*8; } - public function touch($path,$mtime=null) { + public function touch($path, $mtime=null) { $obj=$this->getObject($path); if(is_null($obj)) { return false; @@ -463,10 +471,10 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ $obj->sync_metadata(); } - public function rename($path1,$path2) { + public function rename($path1, $path2) { $sourceContainer=$this->getContainer(dirname($path1)); $targetContainer=$this->getContainer(dirname($path2)); - $result=$sourceContainer->move_object_to(basename($path1),$targetContainer, basename($path2)); + $result=$sourceContainer->move_object_to(basename($path1), $targetContainer, basename($path2)); unset($this->objects[$path1]); if($result) { $targetObj=$this->getObject($path2); @@ -475,10 +483,10 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ return $result; } - public function copy($path1,$path2) { + public function copy($path1, $path2) { $sourceContainer=$this->getContainer(dirname($path1)); $targetContainer=$this->getContainer(dirname($path2)); - $result=$sourceContainer->copy_object_to(basename($path1),$targetContainer, basename($path2)); + $result=$sourceContainer->copy_object_to(basename($path1), $targetContainer, basename($path2)); if($result) { $targetObj=$this->getObject($path2); $this->resetMTime($targetObj); @@ -525,7 +533,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{ } } - private function fromTmpFile($tmpFile,$path) { + private function fromTmpFile($tmpFile, $path) { $obj=$this->getObject($path); if(is_null($obj)) { $obj=$this->createObject($path); diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php index 74e468a2838..ec942b11f6a 100644 --- a/apps/files_external/lib/webdav.php +++ b/apps/files_external/lib/webdav.php @@ -22,17 +22,25 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ public function __construct($params) { $host = $params['host']; //remove leading http[s], will be generated in createBaseUri() - if (substr($host,0,8) == "https://") $host = substr($host, 8); - else if (substr($host,0,7) == "http://") $host = substr($host, 7); + if (substr($host, 0, 8) == "https://") $host = substr($host, 8); + else if (substr($host, 0, 7) == "http://") $host = substr($host, 7); $this->host=$host; $this->user=$params['user']; $this->password=$params['password']; - $this->secure=(isset($params['secure']) && $params['secure'] == 'true')?true:false; + if(isset($params['secure'])){ + if(is_string($params['secure'])){ + $this->secure = ($params['secure'] === 'true'); + }else{ + $this->secure = (bool)$params['secure']; + } + }else{ + $this->secure = false; + } $this->root=isset($params['root'])?$params['root']:'/'; if(!$this->root || $this->root[0]!='/') { $this->root='/'.$this->root; } - if(substr($this->root,-1,1)!='/') { + if(substr($this->root, -1, 1)!='/') { $this->root.='/'; } @@ -46,7 +54,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ if($caview = \OCP\Files::getStorage('files_external')) { $certPath=\OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath("").'rootcerts.crt'; - if (file_exists($certPath)) { + if (file_exists($certPath)) { $this->client->addTrustedCertificates($certPath); } } @@ -65,18 +73,18 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ public function mkdir($path) { $path=$this->cleanPath($path); - return $this->simpleResponse('MKCOL',$path, null,201); + return $this->simpleResponse('MKCOL', $path, null, 201); } public function rmdir($path) { $path=$this->cleanPath($path); - return $this->simpleResponse('DELETE',$path, null,204); + return $this->simpleResponse('DELETE', $path, null, 204); } public function opendir($path) { $path=$this->cleanPath($path); try{ - $response=$this->client->propfind($path, array(),1); + $response=$this->client->propfind($path, array(), 1); $id=md5('webdav'.$this->root.$path); OC_FakeDirStream::$dirs[$id]=array(); $files=array_keys($response); @@ -123,10 +131,10 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ } public function unlink($path) { - return $this->simpleResponse('DELETE',$path, null,204); + return $this->simpleResponse('DELETE', $path, null, 204); } - public function fopen($path,$mode) { + public function fopen($path, $mode) { $path=$this->cleanPath($path); switch($mode) { case 'r': @@ -137,7 +145,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ //straight up curl instead of sabredav here, sabredav put's the entire get result in memory $curl = curl_init(); $fp = fopen('php://temp', 'r+'); - curl_setopt($curl,CURLOPT_USERPWD,$this->user.':'.$this->password); + curl_setopt($curl, CURLOPT_USERPWD, $this->user.':'.$this->password); curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().$path); curl_setopt($curl, CURLOPT_FILE, $fp); @@ -158,18 +166,18 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ case 'c': case 'c+': //emulate these - if(strrpos($path,'.')!==false) { - $ext=substr($path, strrpos($path,'.')); + if(strrpos($path, '.')!==false) { + $ext=substr($path, strrpos($path, '.')); }else{ $ext=''; } $tmpFile=OCP\Files::tmpFile($ext); - OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack'); + OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this, 'writeBack'); if($this->file_exists($path)) { - $this->getFile($path,$tmpFile); + $this->getFile($path, $tmpFile); } self::$tempFiles[$tmpFile]=$path; - return fopen('close://'.$tmpFile,$mode); + return fopen('close://'.$tmpFile, $mode); } } @@ -194,7 +202,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ } } - public function touch($path,$mtime=null) { + public function touch($path, $mtime=null) { if(is_null($mtime)) { $mtime=time(); } @@ -202,16 +210,16 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ $this->client->proppatch($path, array('{DAV:}lastmodified' => $mtime)); } - public function getFile($path,$target) { - $source=$this->fopen($path,'r'); - file_put_contents($target,$source); + public function getFile($path, $target) { + $source=$this->fopen($path, 'r'); + file_put_contents($target, $source); } - public function uploadFile($path,$target) { - $source=fopen($path,'r'); + public function uploadFile($path, $target) { + $source=fopen($path, 'r'); $curl = curl_init(); - curl_setopt($curl,CURLOPT_USERPWD,$this->user.':'.$this->password); + curl_setopt($curl, CURLOPT_USERPWD, $this->user.':'.$this->password); curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().$target); curl_setopt($curl, CURLOPT_BINARYTRANSFER, true); curl_setopt($curl, CURLOPT_INFILE, $source); // file pointer @@ -221,7 +229,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ curl_close ($curl); } - public function rename($path1,$path2) { + public function rename($path1, $path2) { $path1=$this->cleanPath($path1); $path2=$this->root.$this->cleanPath($path2); try{ @@ -235,7 +243,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ } } - public function copy($path1,$path2) { + public function copy($path1, $path2) { $path1=$this->cleanPath($path1); $path2=$this->root.$this->cleanPath($path2); try{ @@ -252,7 +260,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ public function stat($path) { $path=$this->cleanPath($path); try{ - $response=$this->client->propfind($path, array('{DAV:}getlastmodified','{DAV:}getcontentlength')); + $response=$this->client->propfind($path, array('{DAV:}getlastmodified', '{DAV:}getcontentlength')); return array( 'mtime'=>strtotime($response['{DAV:}getlastmodified']), 'size'=>(int)isset($response['{DAV:}getcontentlength']) ? $response['{DAV:}getcontentlength'] : 0, @@ -266,7 +274,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ public function getMimeType($path) { $path=$this->cleanPath($path); try{ - $response=$this->client->propfind($path, array('{DAV:}getcontenttype','{DAV:}resourcetype')); + $response=$this->client->propfind($path, array('{DAV:}getcontenttype', '{DAV:}resourcetype')); $responseType=$response["{DAV:}resourcetype"]->resourceType; $type=(count($responseType)>0 and $responseType[0]=="{DAV:}collection")?'dir':'file'; if($type=='dir') { @@ -283,16 +291,16 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ private function cleanPath($path) { if(!$path || $path[0]=='/') { - return substr($path,1); + return substr($path, 1); }else{ return $path; } } - private function simpleResponse($method,$path,$body,$expected) { + private function simpleResponse($method, $path, $body, $expected) { $path=$this->cleanPath($path); try{ - $response=$this->client->request($method,$path,$body); + $response=$this->client->request($method, $path, $body); return $response['statusCode']==$expected; }catch(Exception $e) { return false; diff --git a/apps/files_external/tests/ftp.php b/apps/files_external/tests/ftp.php index 4549c420410..80288b59114 100644 --- a/apps/files_external/tests/ftp.php +++ b/apps/files_external/tests/ftp.php @@ -24,4 +24,22 @@ class Test_Filestorage_FTP extends Test_FileStorage { OCP\Files::rmdirr($this->instance->constructUrl('')); } } + + public function testConstructUrl(){ + $config = array ( 'host' => 'localhost', 'user' => 'ftp', 'password' => 'ftp', 'root' => '/', 'secure' => false ); + $instance = new OC_Filestorage_FTP($config); + $this->assertEqual('ftp://ftp:ftp@localhost/', $instance->constructUrl('')); + + $config['secure'] = true; + $instance = new OC_Filestorage_FTP($config); + $this->assertEqual('ftps://ftp:ftp@localhost/', $instance->constructUrl('')); + + $config['secure'] = 'false'; + $instance = new OC_Filestorage_FTP($config); + $this->assertEqual('ftp://ftp:ftp@localhost/', $instance->constructUrl('')); + + $config['secure'] = 'true'; + $instance = new OC_Filestorage_FTP($config); + $this->assertEqual('ftps://ftp:ftp@localhost/', $instance->constructUrl('')); + } } diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php index 94b9b1d7aef..36290ad2787 100644 --- a/apps/files_sharing/l10n/et_EE.php +++ b/apps/files_sharing/l10n/et_EE.php @@ -1,6 +1,8 @@ <?php $TRANSLATIONS = array( "Password" => "Parool", "Submit" => "Saada", +"%s shared the folder %s with you" => "%s jagas sinuga kausta %s", +"%s shared the file %s with you" => "%s jagas sinuga faili %s", "Download" => "Lae alla", "No preview available for" => "Eelvaadet pole saadaval", "web services under your control" => "veebitenused sinu kontrolli all" diff --git a/apps/files_sharing/l10n/nb_NO.php b/apps/files_sharing/l10n/nb_NO.php index 6102b03db74..4934c341067 100644 --- a/apps/files_sharing/l10n/nb_NO.php +++ b/apps/files_sharing/l10n/nb_NO.php @@ -1,6 +1,9 @@ <?php $TRANSLATIONS = array( -"Size" => "Størrelse", -"Modified" => "Endret", -"Delete all" => "Slett alle", -"Delete" => "Slett" +"Password" => "Passord", +"Submit" => "Send inn", +"%s shared the folder %s with you" => "%s delte mappen %s med deg", +"%s shared the file %s with you" => "%s delte filen %s med deg", +"Download" => "Last ned", +"No preview available for" => "ForhÃ¥ndsvisning ikke tilgjengelig for", +"web services under your control" => "web tjenester du kontrollerer" ); diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 7271dcc930b..ac6fb1f683e 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -451,7 +451,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common { * @param int $time * @return bool */ - public function hasUpdated($path,$time) { + public function hasUpdated($path, $time) { //TODO return false; } diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 105e94f1140..295273d842b 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -1,223 +1,223 @@ -<?php
-// Load other apps for file previews
-OC_App::loadApps();
-
-// Compatibility with shared-by-link items from ownCloud 4.0
-// requires old Sharing table !
-// support will be removed in OC 5.0,a
-if (isset($_GET['token'])) {
- unset($_GET['file']);
- $qry = \OC_DB::prepare('SELECT `source` FROM `*PREFIX*sharing` WHERE `target` = ? LIMIT 1');
- $filepath = $qry->execute(array($_GET['token']))->fetchOne();
- if(isset($filepath)) {
- $info = OC_FileCache_Cached::get($filepath, '');
- if(strtolower($info['mimetype']) == 'httpd/unix-directory') {
- $_GET['dir'] = $filepath;
- } else {
- $_GET['file'] = $filepath;
- }
- \OCP\Util::writeLog('files_sharing', 'You have files that are shared by link originating from ownCloud 4.0. Redistribute the new links, because backwards compatibility will be removed in ownCloud 5.', \OCP\Util::WARN);
- }
-}
-// Enf of backward compatibility
-
-function getID($path) {
- // use the share table from the db to find the item source if the file was reshared because shared files
- //are not stored in the file cache.
- if (substr(OC_Filesystem::getMountPoint($path), -7, 6) == "Shared") {
- $path_parts = explode('/', $path, 5);
- $user = $path_parts[1];
- $intPath = '/'.$path_parts[4];
- $query = \OC_DB::prepare('SELECT item_source FROM *PREFIX*share WHERE uid_owner = ? AND file_target = ? ');
- $result = $query->execute(array($user, $intPath));
- $row = $result->fetchRow();
- $fileSource = $row['item_source'];
- } else {
- $fileSource = OC_Filecache::getId($path, '');
- }
-
- return $fileSource;
-}
-
-if (isset($_GET['file']) || isset($_GET['dir'])) {
- if (isset($_GET['dir'])) {
- $type = 'folder';
- $path = $_GET['dir'];
- if(strlen($path)>1 and substr($path, -1, 1)==='/') {
- $path=substr($path, 0, -1);
- }
- $baseDir = $path;
- $dir = $baseDir;
- } else {
- $type = 'file';
- $path = $_GET['file'];
- if(strlen($path)>1 and substr($path, -1, 1)==='/') {
- $path=substr($path, 0, -1);
- }
- }
- $uidOwner = substr($path, 1, strpos($path, '/', 1) - 1);
- if (OCP\User::userExists($uidOwner)) {
- OC_Util::setupFS($uidOwner);
- $fileSource = getId($path);
- if ($fileSource != -1 && ($linkItem = OCP\Share::getItemSharedWithByLink($type, $fileSource, $uidOwner))) {
- // TODO Fix in the getItems
- if (!isset($linkItem['item_type']) || $linkItem['item_type'] != $type) {
- header('HTTP/1.0 404 Not Found');
- $tmpl = new OCP\Template('', '404', 'guest');
- $tmpl->printPage();
- exit();
- }
- if (isset($linkItem['share_with'])) {
- // Check password
- if (isset($_GET['file'])) {
- $url = OCP\Util::linkToPublic('files').'&file='.$_GET['file'];
- } else {
- $url = OCP\Util::linkToPublic('files').'&dir='.$_GET['dir'];
- }
- if (isset($_POST['password'])) {
- $password = $_POST['password'];
- $storedHash = $linkItem['share_with'];
- $forcePortable = (CRYPT_BLOWFISH != 1);
- $hasher = new PasswordHash(8, $forcePortable);
- if (!($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), $storedHash))) {
- $tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
- $tmpl->assign('URL', $url);
- $tmpl->assign('error', true);
- $tmpl->printPage();
- exit();
- } else {
- // Save item id in session for future requests
- $_SESSION['public_link_authenticated'] = $linkItem['id'];
- }
- // Check if item id is set in session
- } else if (!isset($_SESSION['public_link_authenticated']) || $_SESSION['public_link_authenticated'] !== $linkItem['id']) {
- // Prompt for password
- $tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
- $tmpl->assign('URL', $url);
- $tmpl->printPage();
- exit();
- }
- }
- $path = $linkItem['path'];
- if (isset($_GET['path'])) {
- $path .= $_GET['path'];
- $dir .= $_GET['path'];
- if (!OC_Filesystem::file_exists($path)) {
- header('HTTP/1.0 404 Not Found');
- $tmpl = new OCP\Template('', '404', 'guest');
- $tmpl->printPage();
- exit();
- }
- }
- // Download the file
- if (isset($_GET['download'])) {
- if (isset($_GET['dir'])) {
- if ( isset($_GET['files']) ) { // download selected files
- OC_Files::get($path, $_GET['files'], $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
- } else if (isset($_GET['path']) && $_GET['path'] != '' ) { // download a file from a shared directory
- OC_Files::get('', $path, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
- } else { // download the whole shared directory
- OC_Files::get($path, '', $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
- }
- } else { // download a single shared file
- OC_Files::get("", $path, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
- }
-
- } else {
- OCP\Util::addStyle('files_sharing', 'public');
- OCP\Util::addScript('files_sharing', 'public');
- OCP\Util::addScript('files', 'fileactions');
- $tmpl = new OCP\Template('files_sharing', 'public', 'base');
- $tmpl->assign('owner', $uidOwner);
- // Show file list
- if (OC_Filesystem::is_dir($path)) {
- OCP\Util::addStyle('files', 'files');
- OCP\Util::addScript('files', 'files');
- OCP\Util::addScript('files', 'filelist');
- $files = array();
- $rootLength = strlen($baseDir) + 1;
- foreach (OC_Files::getDirectoryContent($path) as $i) {
- $i['date'] = OCP\Util::formatDate($i['mtime']);
- if ($i['type'] == 'file') {
- $fileinfo = pathinfo($i['name']);
- $i['basename'] = $fileinfo['filename'];
- $i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : '';
- }
- $i['directory'] = '/'.substr('/'.$uidOwner.'/files'.$i['directory'], $rootLength);
- if ($i['directory'] == '/') {
- $i['directory'] = '';
- }
- $i['permissions'] = OCP\Share::PERMISSION_READ;
- $files[] = $i;
- }
- // Make breadcrumb
- $breadcrumb = array();
- $pathtohere = '';
- $count = 1;
- foreach (explode('/', $dir) as $i) {
- if ($i != '') {
- if ($i != $baseDir) {
- $pathtohere .= '/'.$i;
- }
- if ( strlen($pathtohere) < strlen($_GET['dir'])) {
- continue;
- }
- $breadcrumb[] = array('dir' => str_replace($_GET['dir'], "", $pathtohere, $count), 'name' => $i);
- }
- }
- $list = new OCP\Template('files', 'part.list', '');
- $list->assign('files', $files, false);
- $list->assign('publicListView', true);
- $list->assign('baseURL', OCP\Util::linkToPublic('files').'&dir='.urlencode($_GET['dir']).'&path=', false);
- $list->assign('downloadURL', OCP\Util::linkToPublic('files').'&download&dir='.urlencode($_GET['dir']).'&path=', false);
- $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '' );
- $breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
- $breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files').'&dir='.urlencode($_GET['dir']).'&path=', false);
- $folder = new OCP\Template('files', 'index', '');
- $folder->assign('fileList', $list->fetchPage(), false);
- $folder->assign('breadcrumb', $breadcrumbNav->fetchPage(), false);
- $folder->assign('dir', basename($dir));
- $folder->assign('isCreatable', false);
- $folder->assign('permissions', 0);
- $folder->assign('files', $files);
- $folder->assign('uploadMaxFilesize', 0);
- $folder->assign('uploadMaxHumanFilesize', 0);
- $folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
- $tmpl->assign('folder', $folder->fetchPage(), false);
- $tmpl->assign('uidOwner', $uidOwner);
- $tmpl->assign('dir', basename($dir));
- $tmpl->assign('filename', basename($path));
- $tmpl->assign('mimetype', OC_Filesystem::getMimeType($path));
- $tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
- if (isset($_GET['path'])) {
- $getPath = $_GET['path'];
- } else {
- $getPath = '';
- }
- $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&download&dir='.urlencode($_GET['dir']).'&path='.urlencode($getPath), false);
- } else {
- // Show file preview if viewer is available
- $tmpl->assign('uidOwner', $uidOwner);
- $tmpl->assign('dir', dirname($path));
- $tmpl->assign('filename', basename($path));
- $tmpl->assign('mimetype', OC_Filesystem::getMimeType($path));
- if ($type == 'file') {
- $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&file='.urlencode($_GET['file']).'&download', false);
- } else {
- if (isset($_GET['path'])) {
- $getPath = $_GET['path'];
- } else {
- $getPath = '';
- }
- $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&download&dir='.urlencode($_GET['dir']).'&path='.urlencode($getPath), false);
- }
- }
- $tmpl->printPage();
- }
- exit();
- }
- }
-}
-header('HTTP/1.0 404 Not Found');
-$tmpl = new OCP\Template('', '404', 'guest');
-$tmpl->printPage();
+<?php +// Load other apps for file previews +OC_App::loadApps(); + +// Compatibility with shared-by-link items from ownCloud 4.0 +// requires old Sharing table ! +// support will be removed in OC 5.0,a +if (isset($_GET['token'])) { + unset($_GET['file']); + $qry = \OC_DB::prepare('SELECT `source` FROM `*PREFIX*sharing` WHERE `target` = ? LIMIT 1'); + $filepath = $qry->execute(array($_GET['token']))->fetchOne(); + if(isset($filepath)) { + $info = OC_FileCache_Cached::get($filepath, ''); + if(strtolower($info['mimetype']) == 'httpd/unix-directory') { + $_GET['dir'] = $filepath; + } else { + $_GET['file'] = $filepath; + } + \OCP\Util::writeLog('files_sharing', 'You have files that are shared by link originating from ownCloud 4.0. Redistribute the new links, because backwards compatibility will be removed in ownCloud 5.', \OCP\Util::WARN); + } +} +// Enf of backward compatibility + +function getID($path) { + // use the share table from the db to find the item source if the file was reshared because shared files + //are not stored in the file cache. + if (substr(OC_Filesystem::getMountPoint($path), -7, 6) == "Shared") { + $path_parts = explode('/', $path, 5); + $user = $path_parts[1]; + $intPath = '/'.$path_parts[4]; + $query = \OC_DB::prepare('SELECT item_source FROM *PREFIX*share WHERE uid_owner = ? AND file_target = ? '); + $result = $query->execute(array($user, $intPath)); + $row = $result->fetchRow(); + $fileSource = $row['item_source']; + } else { + $fileSource = OC_Filecache::getId($path, ''); + } + + return $fileSource; +} + +if (isset($_GET['file']) || isset($_GET['dir'])) { + if (isset($_GET['dir'])) { + $type = 'folder'; + $path = $_GET['dir']; + if(strlen($path)>1 and substr($path, -1, 1)==='/') { + $path=substr($path, 0, -1); + } + $baseDir = $path; + $dir = $baseDir; + } else { + $type = 'file'; + $path = $_GET['file']; + if(strlen($path)>1 and substr($path, -1, 1)==='/') { + $path=substr($path, 0, -1); + } + } + $uidOwner = substr($path, 1, strpos($path, '/', 1) - 1); + if (OCP\User::userExists($uidOwner)) { + OC_Util::setupFS($uidOwner); + $fileSource = getId($path); + if ($fileSource != -1 && ($linkItem = OCP\Share::getItemSharedWithByLink($type, $fileSource, $uidOwner))) { + // TODO Fix in the getItems + if (!isset($linkItem['item_type']) || $linkItem['item_type'] != $type) { + header('HTTP/1.0 404 Not Found'); + $tmpl = new OCP\Template('', '404', 'guest'); + $tmpl->printPage(); + exit(); + } + if (isset($linkItem['share_with'])) { + // Check password + if (isset($_GET['file'])) { + $url = OCP\Util::linkToPublic('files').'&file='.$_GET['file']; + } else { + $url = OCP\Util::linkToPublic('files').'&dir='.$_GET['dir']; + } + if (isset($_POST['password'])) { + $password = $_POST['password']; + $storedHash = $linkItem['share_with']; + $forcePortable = (CRYPT_BLOWFISH != 1); + $hasher = new PasswordHash(8, $forcePortable); + if (!($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), $storedHash))) { + $tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest'); + $tmpl->assign('URL', $url); + $tmpl->assign('error', true); + $tmpl->printPage(); + exit(); + } else { + // Save item id in session for future requests + $_SESSION['public_link_authenticated'] = $linkItem['id']; + } + // Check if item id is set in session + } else if (!isset($_SESSION['public_link_authenticated']) || $_SESSION['public_link_authenticated'] !== $linkItem['id']) { + // Prompt for password + $tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest'); + $tmpl->assign('URL', $url); + $tmpl->printPage(); + exit(); + } + } + $path = $linkItem['path']; + if (isset($_GET['path'])) { + $path .= $_GET['path']; + $dir .= $_GET['path']; + if (!OC_Filesystem::file_exists($path)) { + header('HTTP/1.0 404 Not Found'); + $tmpl = new OCP\Template('', '404', 'guest'); + $tmpl->printPage(); + exit(); + } + } + // Download the file + if (isset($_GET['download'])) { + if (isset($_GET['dir'])) { + if ( isset($_GET['files']) ) { // download selected files + OC_Files::get($path, $_GET['files'], $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); + } else if (isset($_GET['path']) && $_GET['path'] != '' ) { // download a file from a shared directory + OC_Files::get('', $path, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); + } else { // download the whole shared directory + OC_Files::get($path, '', $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); + } + } else { // download a single shared file + OC_Files::get("", $path, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); + } + + } else { + OCP\Util::addStyle('files_sharing', 'public'); + OCP\Util::addScript('files_sharing', 'public'); + OCP\Util::addScript('files', 'fileactions'); + $tmpl = new OCP\Template('files_sharing', 'public', 'base'); + $tmpl->assign('owner', $uidOwner); + // Show file list + if (OC_Filesystem::is_dir($path)) { + OCP\Util::addStyle('files', 'files'); + OCP\Util::addScript('files', 'files'); + OCP\Util::addScript('files', 'filelist'); + $files = array(); + $rootLength = strlen($baseDir) + 1; + foreach (OC_Files::getDirectoryContent($path) as $i) { + $i['date'] = OCP\Util::formatDate($i['mtime']); + if ($i['type'] == 'file') { + $fileinfo = pathinfo($i['name']); + $i['basename'] = $fileinfo['filename']; + $i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : ''; + } + $i['directory'] = '/'.substr('/'.$uidOwner.'/files'.$i['directory'], $rootLength); + if ($i['directory'] == '/') { + $i['directory'] = ''; + } + $i['permissions'] = OCP\Share::PERMISSION_READ; + $files[] = $i; + } + // Make breadcrumb + $breadcrumb = array(); + $pathtohere = ''; + $count = 1; + foreach (explode('/', $dir) as $i) { + if ($i != '') { + if ($i != $baseDir) { + $pathtohere .= '/'.$i; + } + if ( strlen($pathtohere) < strlen($_GET['dir'])) { + continue; + } + $breadcrumb[] = array('dir' => str_replace($_GET['dir'], "", $pathtohere, $count), 'name' => $i); + } + } + $list = new OCP\Template('files', 'part.list', ''); + $list->assign('files', $files, false); + $list->assign('publicListView', true); + $list->assign('baseURL', OCP\Util::linkToPublic('files').'&dir='.urlencode($_GET['dir']).'&path=', false); + $list->assign('downloadURL', OCP\Util::linkToPublic('files').'&download&dir='.urlencode($_GET['dir']).'&path=', false); + $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '' ); + $breadcrumbNav->assign('breadcrumb', $breadcrumb, false); + $breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files').'&dir='.urlencode($_GET['dir']).'&path=', false); + $folder = new OCP\Template('files', 'index', ''); + $folder->assign('fileList', $list->fetchPage(), false); + $folder->assign('breadcrumb', $breadcrumbNav->fetchPage(), false); + $folder->assign('dir', basename($dir)); + $folder->assign('isCreatable', false); + $folder->assign('permissions', 0); + $folder->assign('files', $files); + $folder->assign('uploadMaxFilesize', 0); + $folder->assign('uploadMaxHumanFilesize', 0); + $folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true))); + $tmpl->assign('folder', $folder->fetchPage(), false); + $tmpl->assign('uidOwner', $uidOwner); + $tmpl->assign('dir', basename($dir)); + $tmpl->assign('filename', basename($path)); + $tmpl->assign('mimetype', OC_Filesystem::getMimeType($path)); + $tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true))); + if (isset($_GET['path'])) { + $getPath = $_GET['path']; + } else { + $getPath = ''; + } + $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&download&dir='.urlencode($_GET['dir']).'&path='.urlencode($getPath), false); + } else { + // Show file preview if viewer is available + $tmpl->assign('uidOwner', $uidOwner); + $tmpl->assign('dir', dirname($path)); + $tmpl->assign('filename', basename($path)); + $tmpl->assign('mimetype', OC_Filesystem::getMimeType($path)); + if ($type == 'file') { + $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&file='.urlencode($_GET['file']).'&download', false); + } else { + if (isset($_GET['path'])) { + $getPath = $_GET['path']; + } else { + $getPath = ''; + } + $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&download&dir='.urlencode($_GET['dir']).'&path='.urlencode($getPath), false); + } + } + $tmpl->printPage(); + } + exit(); + } + } +} +header('HTTP/1.0 404 Not Found'); +$tmpl = new OCP\Template('', '404', 'guest'); +$tmpl->printPage(); diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php index 746f89a8139..599d302e6e4 100644 --- a/apps/files_versions/appinfo/app.php +++ b/apps/files_versions/appinfo/app.php @@ -5,7 +5,7 @@ OC::$CLASSPATH['OCA_Versions\Storage'] = 'apps/files_versions/lib/versions.php'; OC::$CLASSPATH['OCA_Versions\Hooks'] = 'apps/files_versions/lib/hooks.php'; OCP\App::registerAdmin('files_versions', 'settings'); -OCP\App::registerPersonal('files_versions','settings-personal'); +OCP\App::registerPersonal('files_versions', 'settings-personal'); OCP\Util::addscript('files_versions', 'versions'); diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php index 0ebb34f45e4..deff735cedc 100644 --- a/apps/files_versions/history.php +++ b/apps/files_versions/history.php @@ -22,7 +22,7 @@ */ OCP\User::checkLoggedIn( ); -OCP\Util::addStyle('files_versions','versions'); +OCP\Util::addStyle('files_versions', 'versions'); $tmpl = new OCP\Template( 'files_versions', 'history', 'user' ); if ( isset( $_GET['path'] ) ) { diff --git a/apps/files_versions/l10n/nb_NO.php b/apps/files_versions/l10n/nb_NO.php index 55cc12113d7..b441008db01 100644 --- a/apps/files_versions/l10n/nb_NO.php +++ b/apps/files_versions/l10n/nb_NO.php @@ -1,3 +1,7 @@ <?php $TRANSLATIONS = array( -"Enable Files Versioning" => "Slå på versjonering" +"History" => "Historie", +"Versions" => "Versjoner", +"This will delete all existing backup versions of your files" => "Dette vil slette alle tidligere versjoner av alle filene dine", +"Files Versioning" => "Fil versjonering", +"Enable" => "Aktiver" ); diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php index 822103ebc32..e897a81f7af 100644 --- a/apps/files_versions/lib/hooks.php +++ b/apps/files_versions/lib/hooks.php @@ -64,7 +64,7 @@ class Hooks { $abs_newpath = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$params['newpath'].'.v'; if(Storage::isversioned($rel_oldpath)) { $info=pathinfo($abs_newpath); - if(!file_exists($info['dirname'])) mkdir($info['dirname'],0750, true); + if(!file_exists($info['dirname'])) mkdir($info['dirname'], 0750, true); $versions = Storage::getVersions($rel_oldpath); foreach ($versions as $v) { rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']); diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index 2f27cd0e667..dc83ab12af0 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -1,278 +1,278 @@ -<?php
-/**
- * Copyright (c) 2012 Frank Karlitschek <frank@owncloud.org>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-/**
- * Versions
- *
- * A class to handle the versioning of files.
- */
-
-namespace OCA_Versions;
-
-class Storage {
-
-
- // config.php configuration:
- // - files_versions
- // - files_versionsfolder
- // - files_versionsblacklist
- // - files_versionsmaxfilesize
- // - files_versionsinterval
- // - files_versionmaxversions
- //
- // todo:
- // - finish porting to OC_FilesystemView to enable network transparency
- // - add transparent compression. first test if it´s worth it.
-
- const DEFAULTENABLED=true;
- const DEFAULTBLACKLIST='avi mp3 mpg mp4 ctmp';
- const DEFAULTMAXFILESIZE=1048576; // 10MB
- const DEFAULTMININTERVAL=60; // 1 min
- const DEFAULTMAXVERSIONS=50;
-
- private static function getUidAndFilename($filename)
- {
- if (\OCP\App::isEnabled('files_sharing')
- && substr($filename, 0, 7) == '/Shared'
- && $source = \OCP\Share::getItemSharedWith('file',
- substr($filename, 7),
- \OC_Share_Backend_File::FORMAT_SHARED_STORAGE)) {
- $filename = $source['path'];
- $pos = strpos($filename, '/files', 1);
- $uid = substr($filename, 1, $pos - 1);
- $filename = substr($filename, $pos + 6);
- } else {
- $uid = \OCP\User::getUser();
- }
- return array($uid, $filename);
- }
-
- /**
- * store a new version of a file.
- */
- public function store($filename) {
- if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
- list($uid, $filename) = self::getUidAndFilename($filename);
- $files_view = new \OC_FilesystemView('/'.\OCP\User::getUser() .'/files');
- $users_view = new \OC_FilesystemView('/'.\OCP\User::getUser());
-
- //check if source file already exist as version to avoid recursions.
- // todo does this check work?
- if ($users_view->file_exists($filename)) {
- return false;
- }
-
- // check if filename is a directory
- if($files_view->is_dir($filename)) {
- return false;
- }
-
- // check filetype blacklist
- $blacklist=explode(' ',\OCP\Config::getSystemValue('files_versionsblacklist', Storage::DEFAULTBLACKLIST));
- foreach($blacklist as $bl) {
- $parts=explode('.', $filename);
- $ext=end($parts);
- if(strtolower($ext)==$bl) {
- return false;
- }
- }
- // we should have a source file to work with
- if (!$files_view->file_exists($filename)) {
- return false;
- }
-
- // check filesize
- if($files_view->filesize($filename)>\OCP\Config::getSystemValue('files_versionsmaxfilesize', Storage::DEFAULTMAXFILESIZE)) {
- return false;
- }
-
-
- // check mininterval if the file is being modified by the owner (all shared files should be versioned despite mininterval)
- if ($uid == \OCP\User::getUser()) {
- $versions_fileview = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_versions');
- $versionsName=\OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename);
- $versionsFolderName=\OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('');
- $matches=glob($versionsName.'.v*');
- sort($matches);
- $parts=explode('.v',end($matches));
- if((end($parts)+Storage::DEFAULTMININTERVAL)>time()) {
- return false;
- }
- }
-
-
- // create all parent folders
- $info=pathinfo($filename);
- if(!file_exists($versionsFolderName.'/'.$info['dirname'])) {
- mkdir($versionsFolderName.'/'.$info['dirname'],0750,true);
- }
-
- // store a new version of a file
- $users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.time());
-
- // expire old revisions if necessary
- Storage::expire($filename);
- }
- }
-
-
- /**
- * rollback to an old version of a file.
- */
- public static function rollback($filename,$revision) {
-
- if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
- list($uid, $filename) = self::getUidAndFilename($filename);
- $users_view = new \OC_FilesystemView('/'.\OCP\User::getUser());
-
- // rollback
- if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
-
- return true;
-
- }else{
-
- return false;
-
- }
-
- }
-
- }
-
- /**
- * check if old versions of a file exist.
- */
- public static function isversioned($filename) {
- if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
- list($uid, $filename) = self::getUidAndFilename($filename);
- $versions_fileview = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_versions');
-
- $versionsName=\OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename);
-
- // check for old versions
- $matches=glob($versionsName.'.v*');
- if(count($matches)>0) {
- return true;
- }else{
- return false;
- }
- }else{
- return(false);
- }
- }
-
-
-
- /**
- * @brief get a list of all available versions of a file in descending chronological order
- * @param $filename file to find versions of, relative to the user files dir
- * @param $count number of versions to return
- * @returns array
- */
- public static function getVersions( $filename, $count = 0 ) {
- if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
- list($uid, $filename) = self::getUidAndFilename($filename);
- $versions_fileview = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_versions');
-
- $versionsName = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename);
- $versions = array();
- // fetch for old versions
- $matches = glob( $versionsName.'.v*' );
-
- sort( $matches );
-
- $i = 0;
-
- $files_view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files');
- $local_file = $files_view->getLocalFile($filename);
- foreach( $matches as $ma ) {
-
- $i++;
- $versions[$i]['cur'] = 0;
- $parts = explode( '.v', $ma );
- $versions[$i]['version'] = ( end( $parts ) );
-
- // if file with modified date exists, flag it in array as currently enabled version
- ( \md5_file( $ma ) == \md5_file( $local_file ) ? $versions[$i]['fileMatch'] = 1 : $versions[$i]['fileMatch'] = 0 );
-
- }
-
- $versions = array_reverse( $versions );
-
- foreach( $versions as $key => $value ) {
-
- // flag the first matched file in array (which will have latest modification date) as current version
- if ( $value['fileMatch'] ) {
-
- $value['cur'] = 1;
- break;
-
- }
-
- }
-
- $versions = array_reverse( $versions );
-
- // only show the newest commits
- if( $count != 0 and ( count( $versions )>$count ) ) {
-
- $versions = array_slice( $versions, count( $versions ) - $count );
-
- }
-
- return( $versions );
-
-
- } else {
-
- // if versioning isn't enabled then return an empty array
- return( array() );
-
- }
-
- }
-
- /**
- * @brief Erase a file's versions which exceed the set quota
- */
- public static function expire($filename) {
- if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
- list($uid, $filename) = self::getUidAndFilename($filename);
- $versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions');
-
- $versionsName=\OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename);
-
- // check for old versions
- $matches = glob( $versionsName.'.v*' );
-
- if( count( $matches ) > \OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) ) {
-
- $numberToDelete = count($matches) - \OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS );
-
- // delete old versions of a file
- $deleteItems = array_slice( $matches, 0, $numberToDelete );
-
- foreach( $deleteItems as $de ) {
-
- unlink( $versionsName.'.v'.$de );
-
- }
- }
- }
- }
-
- /**
- * @brief Erase all old versions of all user files
- * @return true/false
- */
- public function expireAll() {
- $view = \OCP\Files::getStorage('files_versions');
- return $view->deleteAll('', true);
- }
+<?php +/** + * Copyright (c) 2012 Frank Karlitschek <frank@owncloud.org> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +/** + * Versions + * + * A class to handle the versioning of files. + */ + +namespace OCA_Versions; + +class Storage { + + + // config.php configuration: + // - files_versions + // - files_versionsfolder + // - files_versionsblacklist + // - files_versionsmaxfilesize + // - files_versionsinterval + // - files_versionmaxversions + // + // todo: + // - finish porting to OC_FilesystemView to enable network transparency + // - add transparent compression. first test if it´s worth it. + + const DEFAULTENABLED=true; + const DEFAULTBLACKLIST='avi mp3 mpg mp4 ctmp'; + const DEFAULTMAXFILESIZE=1048576; // 10MB + const DEFAULTMININTERVAL=60; // 1 min + const DEFAULTMAXVERSIONS=50; + + private static function getUidAndFilename($filename) + { + if (\OCP\App::isEnabled('files_sharing') + && substr($filename, 0, 7) == '/Shared' + && $source = \OCP\Share::getItemSharedWith('file', + substr($filename, 7), + \OC_Share_Backend_File::FORMAT_SHARED_STORAGE)) { + $filename = $source['path']; + $pos = strpos($filename, '/files', 1); + $uid = substr($filename, 1, $pos - 1); + $filename = substr($filename, $pos + 6); + } else { + $uid = \OCP\User::getUser(); + } + return array($uid, $filename); + } + + /** + * store a new version of a file. + */ + public function store($filename) { + if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { + list($uid, $filename) = self::getUidAndFilename($filename); + $files_view = new \OC_FilesystemView('/'.\OCP\User::getUser() .'/files'); + $users_view = new \OC_FilesystemView('/'.\OCP\User::getUser()); + + //check if source file already exist as version to avoid recursions. + // todo does this check work? + if ($users_view->file_exists($filename)) { + return false; + } + + // check if filename is a directory + if($files_view->is_dir($filename)) { + return false; + } + + // check filetype blacklist + $blacklist=explode(' ', \OCP\Config::getSystemValue('files_versionsblacklist', Storage::DEFAULTBLACKLIST)); + foreach($blacklist as $bl) { + $parts=explode('.', $filename); + $ext=end($parts); + if(strtolower($ext)==$bl) { + return false; + } + } + // we should have a source file to work with + if (!$files_view->file_exists($filename)) { + return false; + } + + // check filesize + if($files_view->filesize($filename)>\OCP\Config::getSystemValue('files_versionsmaxfilesize', Storage::DEFAULTMAXFILESIZE)) { + return false; + } + + + // check mininterval if the file is being modified by the owner (all shared files should be versioned despite mininterval) + if ($uid == \OCP\User::getUser()) { + $versions_fileview = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_versions'); + $versionsName=\OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename); + $versionsFolderName=\OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath(''); + $matches=glob($versionsName.'.v*'); + sort($matches); + $parts=explode('.v', end($matches)); + if((end($parts)+Storage::DEFAULTMININTERVAL)>time()) { + return false; + } + } + + + // create all parent folders + $info=pathinfo($filename); + if(!file_exists($versionsFolderName.'/'.$info['dirname'])) { + mkdir($versionsFolderName.'/'.$info['dirname'], 0750, true); + } + + // store a new version of a file + $users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.time()); + + // expire old revisions if necessary + Storage::expire($filename); + } + } + + + /** + * rollback to an old version of a file. + */ + public static function rollback($filename, $revision) { + + if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { + list($uid, $filename) = self::getUidAndFilename($filename); + $users_view = new \OC_FilesystemView('/'.\OCP\User::getUser()); + + // rollback + if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) { + + return true; + + }else{ + + return false; + + } + + } + + } + + /** + * check if old versions of a file exist. + */ + public static function isversioned($filename) { + if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { + list($uid, $filename) = self::getUidAndFilename($filename); + $versions_fileview = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_versions'); + + $versionsName=\OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename); + + // check for old versions + $matches=glob($versionsName.'.v*'); + if(count($matches)>0) { + return true; + }else{ + return false; + } + }else{ + return(false); + } + } + + + + /** + * @brief get a list of all available versions of a file in descending chronological order + * @param $filename file to find versions of, relative to the user files dir + * @param $count number of versions to return + * @returns array + */ + public static function getVersions( $filename, $count = 0 ) { + if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) { + list($uid, $filename) = self::getUidAndFilename($filename); + $versions_fileview = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_versions'); + + $versionsName = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename); + $versions = array(); + // fetch for old versions + $matches = glob( $versionsName.'.v*' ); + + sort( $matches ); + + $i = 0; + + $files_view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files'); + $local_file = $files_view->getLocalFile($filename); + foreach( $matches as $ma ) { + + $i++; + $versions[$i]['cur'] = 0; + $parts = explode( '.v', $ma ); + $versions[$i]['version'] = ( end( $parts ) ); + + // if file with modified date exists, flag it in array as currently enabled version + ( \md5_file( $ma ) == \md5_file( $local_file ) ? $versions[$i]['fileMatch'] = 1 : $versions[$i]['fileMatch'] = 0 ); + + } + + $versions = array_reverse( $versions ); + + foreach( $versions as $key => $value ) { + + // flag the first matched file in array (which will have latest modification date) as current version + if ( $value['fileMatch'] ) { + + $value['cur'] = 1; + break; + + } + + } + + $versions = array_reverse( $versions ); + + // only show the newest commits + if( $count != 0 and ( count( $versions )>$count ) ) { + + $versions = array_slice( $versions, count( $versions ) - $count ); + + } + + return( $versions ); + + + } else { + + // if versioning isn't enabled then return an empty array + return( array() ); + + } + + } + + /** + * @brief Erase a file's versions which exceed the set quota + */ + public static function expire($filename) { + if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { + list($uid, $filename) = self::getUidAndFilename($filename); + $versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions'); + + $versionsName=\OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename); + + // check for old versions + $matches = glob( $versionsName.'.v*' ); + + if( count( $matches ) > \OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) ) { + + $numberToDelete = count($matches) - \OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ); + + // delete old versions of a file + $deleteItems = array_slice( $matches, 0, $numberToDelete ); + + foreach( $deleteItems as $de ) { + + unlink( $versionsName.'.v'.$de ); + + } + } + } + } + + /** + * @brief Erase all old versions of all user files + * @return true/false + */ + public function expireAll() { + $view = \OCP\Files::getStorage('files_versions'); + return $view->deleteAll('', true); + } } diff --git a/apps/files_versions/settings-personal.php b/apps/files_versions/settings-personal.php index 4fb866bd999..6555bc99c3e 100644 --- a/apps/files_versions/settings-personal.php +++ b/apps/files_versions/settings-personal.php @@ -2,6 +2,6 @@ $tmpl = new OCP\Template( 'files_versions', 'settings-personal'); -OCP\Util::addscript('files_versions','settings-personal'); +OCP\Util::addscript('files_versions', 'settings-personal'); return $tmpl->fetchPage(); diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php index 6c6cc5679ba..63437310088 100644 --- a/apps/user_ldap/group_ldap.php +++ b/apps/user_ldap/group_ldap.php @@ -124,7 +124,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface { $this->connection->ldapGroupFilter, $this->connection->ldapGroupMemberAssocAttr.'='.$uid )); - $groups = $this->fetchListOfGroups($filter, array($this->connection->ldapGroupDisplayName,'dn')); + $groups = $this->fetchListOfGroups($filter, array($this->connection->ldapGroupDisplayName, 'dn')); $groups = array_unique($this->ownCloudGroupNames($groups), SORT_LOCALE_STRING); $this->connection->writeToCache($cacheKey, $groups); diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php index f83142225e2..9752d73c1c0 100644 --- a/apps/user_ldap/l10n/et_EE.php +++ b/apps/user_ldap/l10n/et_EE.php @@ -1,9 +1,14 @@ <?php $TRANSLATIONS = array( "Host" => "Host", +"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Sa ei saa protokolli ära jätta, välja arvatud siis, kui sa nõuad SSL-ühendust. Sel juhul alusta eesliitega ldaps://", "Base DN" => "Baas DN", +"You can specify Base DN for users and groups in the Advanced tab" => "Sa saad kasutajate ja gruppide baas DN-i määrata lisavalikute vahekaardilt", "User DN" => "Kasutaja DN", +"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Klientkasutaja DN, kellega seotakse, nt. uid=agent,dc=näidis,dc=com. Anonüümseks ligipääsuks jäta DN ja parool tühjaks.", "Password" => "Parool", +"For anonymous access, leave DN and Password empty." => "Anonüümseks ligipääsuks jäta DN ja parool tühjaks.", "User Login Filter" => "Kasutajanime filter", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime.", "use %%uid placeholder, e.g. \"uid=%%uid\"" => "kasuta %%uid kohatäitjat, nt. \"uid=%%uid\"", "User List Filter" => "Kasutajate nimekirja filter", "Defines the filter to apply, when retrieving users." => "Määrab kasutajaid hankides filtri, mida rakendatakse.", @@ -19,6 +24,7 @@ "Do not use it for SSL connections, it will fail." => "Ära kasuta seda SSL ühenduse jaoks, see ei toimi.", "Case insensitve LDAP server (Windows)" => "Mittetõstutundlik LDAP server (Windows)", "Turn off SSL certificate validation." => "Lülita SSL sertifikaadi kontrollimine välja.", +"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Kui ühendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma ownCloud serverisse.", "Not recommended, use for testing only." => "Pole soovitatav, kasuta ainult testimiseks.", "User Display Name Field" => "Kasutaja näidatava nime väli", "The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP omadus, mida kasutatakse kasutaja ownCloudi nime loomiseks.", diff --git a/apps/user_ldap/l10n/nb_NO.php b/apps/user_ldap/l10n/nb_NO.php new file mode 100644 index 00000000000..a5f4657d045 --- /dev/null +++ b/apps/user_ldap/l10n/nb_NO.php @@ -0,0 +1,11 @@ +<?php $TRANSLATIONS = array( +"Password" => "Passord", +"Group Filter" => "Gruppefilter", +"Port" => "Port", +"Use TLS" => "Bruk TLS", +"Do not use it for SSL connections, it will fail." => "Ikke bruk for SSL tilkoblinger, dette vil ikke fungere.", +"Not recommended, use for testing only." => "Ikke anbefalt, bruk kun for testing", +"in bytes" => "i bytes", +"in seconds. A change empties the cache." => "i sekunder. En endring tømmer bufferen.", +"Help" => "Hjelp" +); diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index a570b29b793..ef92bbad40a 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -180,22 +180,22 @@ class Connection { * Caches the general LDAP configuration. */ private function readConfiguration($force = false) { - \OCP\Util::writeLog('user_ldap','Checking conf state: isConfigured? '.print_r($this->configured, true).' isForce? '.print_r($force, true).' configID? '.print_r($this->configID, true), \OCP\Util::DEBUG); + \OCP\Util::writeLog('user_ldap', 'Checking conf state: isConfigured? '.print_r($this->configured, true).' isForce? '.print_r($force, true).' configID? '.print_r($this->configID, true), \OCP\Util::DEBUG); if((!$this->configured || $force) && !is_null($this->configID)) { - \OCP\Util::writeLog('user_ldap','Reading the configuration', \OCP\Util::DEBUG); + \OCP\Util::writeLog('user_ldap', 'Reading the configuration', \OCP\Util::DEBUG); $this->config['ldapHost'] = \OCP\Config::getAppValue($this->configID, 'ldap_host', ''); $this->config['ldapPort'] = \OCP\Config::getAppValue($this->configID, 'ldap_port', 389); - $this->config['ldapAgentName'] = \OCP\Config::getAppValue($this->configID, 'ldap_dn',''); - $this->config['ldapAgentPassword'] = base64_decode(\OCP\Config::getAppValue($this->configID, 'ldap_agent_password','')); + $this->config['ldapAgentName'] = \OCP\Config::getAppValue($this->configID, 'ldap_dn', ''); + $this->config['ldapAgentPassword'] = base64_decode(\OCP\Config::getAppValue($this->configID, 'ldap_agent_password', '')); $this->config['ldapBase'] = \OCP\Config::getAppValue($this->configID, 'ldap_base', ''); - $this->config['ldapBaseUsers'] = \OCP\Config::getAppValue($this->configID, 'ldap_base_users',$this->config['ldapBase']); + $this->config['ldapBaseUsers'] = \OCP\Config::getAppValue($this->configID, 'ldap_base_users', $this->config['ldapBase']); $this->config['ldapBaseGroups'] = \OCP\Config::getAppValue($this->configID, 'ldap_base_groups', $this->config['ldapBase']); - $this->config['ldapTLS'] = \OCP\Config::getAppValue($this->configID, 'ldap_tls',0); + $this->config['ldapTLS'] = \OCP\Config::getAppValue($this->configID, 'ldap_tls', 0); $this->config['ldapNoCase'] = \OCP\Config::getAppValue($this->configID, 'ldap_nocase', 0); $this->config['turnOffCertCheck'] = \OCP\Config::getAppValue($this->configID, 'ldap_turn_off_cert_check', 0); $this->config['ldapUserDisplayName'] = mb_strtolower(\OCP\Config::getAppValue($this->configID, 'ldap_display_name', 'uid'), 'UTF-8'); - $this->config['ldapUserFilter'] = \OCP\Config::getAppValue($this->configID, 'ldap_userlist_filter','objectClass=person'); - $this->config['ldapGroupFilter'] = \OCP\Config::getAppValue($this->configID, 'ldap_group_filter','(objectClass=posixGroup)'); + $this->config['ldapUserFilter'] = \OCP\Config::getAppValue($this->configID, 'ldap_userlist_filter', 'objectClass=person'); + $this->config['ldapGroupFilter'] = \OCP\Config::getAppValue($this->configID, 'ldap_group_filter', '(objectClass=posixGroup)'); $this->config['ldapLoginFilter'] = \OCP\Config::getAppValue($this->configID, 'ldap_login_filter', '(uid=%uid)'); $this->config['ldapGroupDisplayName'] = mb_strtolower(\OCP\Config::getAppValue($this->configID, 'ldap_group_display_name', 'uid'), 'UTF-8'); $this->config['ldapQuotaAttribute'] = \OCP\Config::getAppValue($this->configID, 'ldap_quota_attr', ''); @@ -263,7 +263,7 @@ class Connection { if(empty($this->config['ldapGroupFilter']) && empty($this->config['ldapGroupMemberAssocAttr'])) { \OCP\Util::writeLog('user_ldap', 'No group filter is specified, LDAP group feature will not be used.', \OCP\Util::INFO); } - if(!in_array($this->config['ldapUuidAttribute'], array('auto','entryuuid', 'nsuniqueid', 'objectguid')) && (!is_null($this->configID))) { + if(!in_array($this->config['ldapUuidAttribute'], array('auto', 'entryuuid', 'nsuniqueid', 'objectguid')) && (!is_null($this->configID))) { \OCP\Config::setAppValue($this->configID, 'ldap_uuid_attribute', 'auto'); \OCP\Util::writeLog('user_ldap', 'Illegal value for the UUID Attribute, reset to autodetect.', \OCP\Util::INFO); } diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php index f765151456a..2ee936d29a8 100644 --- a/apps/user_ldap/settings.php +++ b/apps/user_ldap/settings.php @@ -26,16 +26,12 @@ OCP\Util::addscript('user_ldap', 'settings'); OCP\Util::addstyle('user_ldap', 'settings'); if ($_POST) { + $clearCache = false; foreach($params as $param) { if(isset($_POST[$param])) { + $clearCache = true; if('ldap_agent_password' == $param) { OCP\Config::setAppValue('user_ldap', $param, base64_encode($_POST[$param])); - } elseif('ldap_cache_ttl' == $param) { - if(OCP\Config::getAppValue('user_ldap', $param,'') != $_POST[$param]) { - $ldap = new \OCA\user_ldap\lib\Connection('user_ldap'); - $ldap->clearCache(); - OCP\Config::setAppValue('user_ldap', $param, $_POST[$param]); - } } elseif('home_folder_naming_rule' == $param) { $value = empty($_POST[$param]) ? 'opt:username' : 'attr:'.$_POST[$param]; OCP\Config::setAppValue('user_ldap', $param, $value); @@ -54,12 +50,16 @@ if ($_POST) { OCP\Config::setAppValue('user_ldap', $param, 0); } } + if($clearCache) { + $ldap = new \OCA\user_ldap\lib\Connection('user_ldap'); + $ldap->clearCache(); + } } // fill template $tmpl = new OCP\Template( 'user_ldap', 'settings'); foreach($params as $param) { - $value = OCP\Config::getAppValue('user_ldap', $param,''); + $value = OCP\Config::getAppValue('user_ldap', $param, ''); $tmpl->assign($param, $value); } diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php index 3a653ad7208..d10062c1d9d 100644 --- a/apps/user_ldap/templates/settings.php +++ b/apps/user_ldap/templates/settings.php @@ -29,7 +29,7 @@ <p><label for="ldap_cache_ttl">Cache Time-To-Live</label><input type="text" id="ldap_cache_ttl" name="ldap_cache_ttl" value="<?php echo $_['ldap_cache_ttl']; ?>" title="<?php echo $l->t('in seconds. A change empties the cache.');?>" /></p> <p><label for="home_folder_naming_rule">User Home Folder Naming Rule</label><input type="text" id="home_folder_naming_rule" name="home_folder_naming_rule" value="<?php echo $_['home_folder_naming_rule']; ?>" title="<?php echo $l->t('Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute.');?>" /></p> </fieldset> - <input type="submit" value="Save" /> <button id="ldap_action_test_connection" name="ldap_action_test_connection">Test Configuration</button> <a href="http://owncloud.org/support/ldap-backend/" target="_blank"><img src="<?php echo OCP\Util::imagePath('','actions/info.png'); ?>" style="height:1.75ex" /> <?php echo $l->t('Help');?></a> + <input type="submit" value="Save" /> <button id="ldap_action_test_connection" name="ldap_action_test_connection">Test Configuration</button> <a href="http://owncloud.org/support/ldap-backend/" target="_blank"><img src="<?php echo OCP\Util::imagePath('', 'actions/info.png'); ?>" style="height:1.75ex" /> <?php echo $l->t('Help');?></a> </div> </form> diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php index 2acb8c35a19..f99902d32f5 100644 --- a/apps/user_ldap/tests/group_ldap.php +++ b/apps/user_ldap/tests/group_ldap.php @@ -32,8 +32,8 @@ class Test_Group_Ldap extends UnitTestCase { $this->assertIsA(OC_Group::getGroups(), gettype(array())); $this->assertIsA($group_ldap->getGroups(), gettype(array())); - $this->assertFalse(OC_Group::inGroup('john','dosers'), gettype(false)); - $this->assertFalse($group_ldap->inGroup('john','dosers'), gettype(false)); + $this->assertFalse(OC_Group::inGroup('john', 'dosers'), gettype(false)); + $this->assertFalse($group_ldap->inGroup('john', 'dosers'), gettype(false)); //TODO: check also for expected true result. This backend won't be able to do any modifications, maybe use a dummy for this. $this->assertIsA(OC_Group::getUserGroups('john doe'), gettype(array())); diff --git a/apps/user_webdavauth/appinfo/app.php b/apps/user_webdavauth/appinfo/app.php index 3ab323becce..c4c131b7ef0 100755 --- a/apps/user_webdavauth/appinfo/app.php +++ b/apps/user_webdavauth/appinfo/app.php @@ -23,7 +23,7 @@ require_once 'apps/user_webdavauth/user_webdavauth.php'; -OC_APP::registerAdmin('user_webdavauth','settings'); +OC_APP::registerAdmin('user_webdavauth', 'settings'); OC_User::registerBackend("WEBDAVAUTH"); OC_User::useBackend( "WEBDAVAUTH" ); diff --git a/apps/user_webdavauth/appinfo/info.xml b/apps/user_webdavauth/appinfo/info.xml index 9a8027daee6..0d9f529ed1b 100755 --- a/apps/user_webdavauth/appinfo/info.xml +++ b/apps/user_webdavauth/appinfo/info.xml @@ -2,10 +2,12 @@ <info> <id>user_webdavauth</id> <name>WebDAV user backend</name> - <description>Authenticate Users by a WebDAV call</description> - <version>1.0</version> + <description>Authenticate users by a WebDAV call. You can use any WebDAV server, ownCloud server or other webserver to authenticate. It should return http 200 for right credentials and http 401 for wrong ones.</description> <licence>AGPL</licence> <author>Frank Karlitschek</author> <require>4.9</require> <shipped>true</shipped> + <types> + <authentication/> + </types> </info> diff --git a/apps/user_webdavauth/appinfo/version b/apps/user_webdavauth/appinfo/version new file mode 100644 index 00000000000..a6bbdb5ff48 --- /dev/null +++ b/apps/user_webdavauth/appinfo/version @@ -0,0 +1 @@ +1.1.0.0 diff --git a/apps/user_webdavauth/settings.php b/apps/user_webdavauth/settings.php index 4f1ddbbefda..497a3385caa 100755 --- a/apps/user_webdavauth/settings.php +++ b/apps/user_webdavauth/settings.php @@ -21,7 +21,6 @@ * */ -print_r($_POST); if($_POST) { if(isset($_POST['webdav_url'])) { diff --git a/apps/user_webdavauth/templates/settings.php b/apps/user_webdavauth/templates/settings.php index c00c199632a..e6ca5d97d3c 100755 --- a/apps/user_webdavauth/templates/settings.php +++ b/apps/user_webdavauth/templates/settings.php @@ -1,7 +1,7 @@ <form id="webdavauth" action="#" method="post"> <fieldset class="personalblock"> <legend><strong>WebDAV Authentication</strong></legend> - <p><label for="webdav_url"><?php echo $l->t('webdav_url');?><input type="text" id="webdav_url" name="webdav_url" value="<?php echo $_['webdav_url']; ?>"></label> + <p><label for="webdav_url"><?php echo $l->t('WebDAV URL: http://');?><input type="text" id="webdav_url" name="webdav_url" value="<?php echo $_['webdav_url']; ?>"></label> <input type="submit" value="Save" /> </fieldset> </form> diff --git a/apps/user_webdavauth/user_webdavauth.php b/apps/user_webdavauth/user_webdavauth.php index bd9f45d357b..0b0be7c2fa1 100755 --- a/apps/user_webdavauth/user_webdavauth.php +++ b/apps/user_webdavauth/user_webdavauth.php @@ -30,24 +30,23 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend { public function createUser() { // Can't create user - OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to create users from web frontend using WebDAV user backend',3); + OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to create users from web frontend using WebDAV user backend', 3); return false; } - public function deleteUser() { + public function deleteUser($uid) { // Can't delete user - OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to delete users from web frontend using WebDAV user backend',3); + OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to delete users from web frontend using WebDAV user backend', 3); return false; } public function setPassword ( $uid, $password ) { // We can't change user password - OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to change password for users from web frontend using WebDAV user backend',3); + OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to change password for users from web frontend using WebDAV user backend', 3); return false; } public function checkPassword( $uid, $password ) { - $url= 'http://'.urlencode($uid).':'.urlencode($password).'@'.$this->webdavauth_url; $headers = get_headers($url); if($headers==false) { @@ -58,9 +57,9 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend { $returncode= substr($headers[0], 9, 3); if($returncode=='401') { - return false; + return(false); }else{ - return true; + return($uid); } } @@ -68,14 +67,15 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend { /* * we don´t know if a user exists without the password. so we have to return false all the time */ - public function userExists( $uid ) { - return false; + public function userExists( $uid ){ + return true; } + /* * we don´t know the users so all we can do it return an empty array here */ - public function getUsers() { + public function getUsers($search = '', $limit = 10, $offset = 0) { $returnArray = array(); return $returnArray; diff --git a/core/ajax/requesttoken.php b/core/ajax/requesttoken.php deleted file mode 100644 index 9d43a722852..00000000000 --- a/core/ajax/requesttoken.php +++ /dev/null @@ -1,40 +0,0 @@ -<?php -/** -* ownCloud -* @author Christian Reiner -* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info> -* -* 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 <http://www.gnu.org/licenses/>. -* -*/ - -/** - * @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 - */ - -// 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/css/styles.css b/core/css/styles.css index 95dceb50dec..646a760f989 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -44,6 +44,7 @@ textarea:hover, textarea:focus, textarea:active { background-color:#fff; color:# input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, select, .pager li a { width:auto; padding:.4em; border:1px solid #ddd; font-weight:bold; cursor:pointer; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; } input[type="submit"]:hover, input[type="submit"]:focus, input[type="button"]:hover, select:hover, select:focus, select:active, input[type="button"]:focus, .button:hover { background:#fff; color:#333; } +input[type="submit"] img, input[type="button"] img, button img, .button img { cursor:pointer; } input[type="checkbox"] { width:auto; } #quota { cursor:default; } diff --git a/core/js/eventsource.js b/core/js/eventsource.js index 45c63715a7e..e3ad7e3a671 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.Request.Token; + dataStr+='requesttoken='+OC.EventSource.requesttoken; if(!this.useFallBack && typeof EventSource !='undefined'){ this.source=new EventSource(src+'?'+dataStr); this.source.onmessage=function(e){ diff --git a/core/js/js.js b/core/js/js.js index 2073fc4d4b7..87d0a172082 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -649,7 +649,7 @@ $.fn.filterAttr = function(attr_name, attr_value) { function humanFileSize(size) { var humanList = ['B', 'kB', 'MB', 'GB', 'TB']; // Calculate Log with base 1024: size = 1024 ** order - var order = Math.floor(Math.log(size) / Math.log(1024)); + var order = size?Math.floor(Math.log(size) / Math.log(1024)):0; // Stay in range of the byte sizes that are defined order = Math.min(humanList.length - 1, order); var readableFormat = humanList[order]; diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 2467af61121..28dec97fd30 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -66,39 +66,42 @@ var OCdialogs = { /** * prompt user for input with custom form * fields should be passed in following format: [{text:'prompt text', name:'return name', type:'input type', value: 'dafault value'},...] + * select example var fields=[{text:'Test', name:'test', type:'select', options:[{text:'hallo',value:1},{text:'hallo1',value:2}] }]; * @param fields to display * @param title dialog title * @param callback which will be triggered when user press OK (user answers will be passed to callback in following format: [{name:'return name', value: 'user value'},...]) */ form:function(fields, title, callback, modal) { var content = '<table>'; - for (var a in fields) { - content += '<tr><td>'+fields[a].text+'</td><td>'; - var type=fields[a].type; + $.each(fields, function(index, val){ + content += '<tr><td>'+val.text+'</td><td>'; + var type=val.type; + if (type == 'text' || type == 'checkbox' || type == 'password') { - content += '<input type="'+type+'" name="'+fields[a].name+'"'; + content += '<input type="'+type+'" name="'+val.name+'"'; if (type == 'checkbox') { - if (fields[a].value != undefined && fields[a].value == true) { + if (val.value != undefined && val.value == true) { content += ' checked="checked">'; } else { content += '>'; } - } else if (type == 'text' || type == 'password' && fields[a].value) { - content += ' value="'+fields[a].value+'">'; + } else if (type == 'text' || type == 'password' && val.value) { + content += ' value="'+val.value+'">'; } } else if (type == 'select') { - content += '<select name="'+fields[a].name+'"'; - if (fields[a].value != undefined) { - content += ' value="'+fields[a].value+'"'; + content += '<select name="'+val.name+'"'; + if (val.value != undefined) { + content += ' value="'+val.value+'"'; } content += '>'; - for (var o in fields[a].options) { - content += '<option value="'+fields[a].options[o].value+'">'+fields[a].options[o].text+'</option>'; - } + $.each(val.options, function(index, valo){ + content += '<option value="'+valo.value+'">'+valo.text+'</option>'; + }); content += '</select>'; } content += '</td></tr>'; - } + + }); content += '</table>'; OCdialogs.message(content, title, OCdialogs.FORM_DIALOG, OCdialogs.OK_CANCEL_BUTTONS, callback, modal); }, @@ -215,9 +218,10 @@ var OCdialogs = { fillFilePicker:function(r, dialog_content_id) { var entry_template = '<div onclick="javascript:OC.dialogs.handlePickerClick(this, \'*ENTRYNAME*\',\''+dialog_content_id+'\')" data="*ENTRYTYPE*"><img src="*MIMETYPEICON*" style="margin-right:1em;"><span id="filename">*NAME*</span><div style="float:right;margin-right:1em;">*LASTMODDATE*</div></div>'; var names = ''; - for (var a in r.data) { - names += entry_template.replace('*LASTMODDATE*', OC.mtime2date(r.data[a].mtime)).replace('*NAME*', r.data[a].name).replace('*MIMETYPEICON*', r.data[a].mimetype_icon).replace('*ENTRYNAME*', r.data[a].name).replace('*ENTRYTYPE*', r.data[a].type); - } + $.each(r.data, function(index, a) { + names += entry_template.replace('*LASTMODDATE*', OC.mtime2date(a.mtime)).replace('*NAME*', a.name).replace('*MIMETYPEICON*', a.mimetype_icon).replace('*ENTRYNAME*', a.name).replace('*ENTRYTYPE*', a.type); + }); + $(dialog_content_id + ' #filelist').html(names); $(dialog_content_id + ' .filepicker_loader').css('visibility', 'hidden'); }, diff --git a/core/js/requesttoken.js b/core/js/requesttoken.js deleted file mode 100644 index 0d78cd7e93b..00000000000 --- a/core/js/requesttoken.js +++ /dev/null @@ -1,55 +0,0 @@ -/** - * 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 <foss@christian-reiner.info> - * - * 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 <http://www.gnu.org/licenses/>. - * - */ - -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/l10n/de.php b/core/l10n/de.php index 3c92f028581..2e761280519 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -37,7 +37,9 @@ "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}" => "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}", -"You will receive a link to reset your password via Email." => "Du erhälst einen Link per E-Mail, um Dein Passwort zurückzusetzen.", +"You will receive a link to reset your password via Email." => "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.", +"Reset email send." => "Die E-Mail zum Zurücksetzen wurde versendet.", +"Request failed!" => "Die Anfrage schlug fehl!", "Username" => "Benutzername", "Request reset" => "Beantrage Zurücksetzung", "Your password was reset" => "Dein Passwort wurde zurückgesetzt.", diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php index 9dd70a0e18a..1425970f3a4 100644 --- a/core/l10n/de_DE.php +++ b/core/l10n/de_DE.php @@ -38,7 +38,8 @@ "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 per E-Mail, um Ihr Passwort zurückzusetzen.", -"Request failed!" => "Die Anforderung schlug fehl!", +"Reset email send." => "E-Mail zum Zurücksetzen des Passworts gesendet.", +"Request failed!" => "Die Anfrage schlug fehl!", "Username" => "Benutzername", "Request reset" => "Beantrage Zurücksetzung", "Your password was reset" => "Ihr Passwort wurde zurückgesetzt.", diff --git a/core/l10n/es.php b/core/l10n/es.php index c9b58ef7cd1..86c95cce5f0 100644 --- a/core/l10n/es.php +++ b/core/l10n/es.php @@ -38,6 +38,8 @@ "ownCloud password reset" => "Reiniciar contraseña de ownCloud", "Use the following link to reset your password: {link}" => "Utiliza el siguiente enlace para restablecer tu contraseña: {link}", "You will receive a link to reset your password via Email." => "Recibirás un enlace por correo electrónico para restablecer tu contraseña", +"Reset email send." => "Email de reconfiguración enviado.", +"Request failed!" => "Pedido fallado!", "Username" => "Nombre de usuario", "Request reset" => "Solicitar restablecimiento", "Your password was reset" => "Tu contraseña se ha restablecido", diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php index 622fc65a770..5cbdbe42401 100644 --- a/core/l10n/es_AR.php +++ b/core/l10n/es_AR.php @@ -38,6 +38,8 @@ "ownCloud password reset" => "Restablecer contraseña de ownCloud", "Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}", "You will receive a link to reset your password via Email." => "Vas a recibir un enlace por e-mail para restablecer tu contraseña", +"Reset email send." => "Reiniciar envÃo de email.", +"Request failed!" => "Error en el pedido!", "Username" => "Nombre de usuario", "Request reset" => "Solicitar restablecimiento", "Your password was reset" => "Tu contraseña fue restablecida", diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php index 710547f2a15..7554de8b6f2 100644 --- a/core/l10n/et_EE.php +++ b/core/l10n/et_EE.php @@ -13,6 +13,7 @@ "Error while sharing" => "Viga jagamisel", "Error while unsharing" => "Viga jagamise lõpetamisel", "Error while changing permissions" => "Viga õiguste muutmisel", +"Shared with you by {owner}" => "Sinuga jagas {owner}", "Share with" => "Jaga", "Share with link" => "Jaga lingiga", "Password protect" => "Parooliga kaitstud", @@ -21,6 +22,7 @@ "Expiration date" => "Aegumise kuupäev", "Share via email:" => "Jaga e-postiga:", "No people found" => "Ãœhtegi inimest ei leitud", +"Resharing is not allowed" => "Edasijagamine pole lubatud", "Unshare" => "Lõpeta jagamine", "can edit" => "saab muuta", "access control" => "ligipääsukontroll", @@ -29,9 +31,13 @@ "delete" => "kustuta", "share" => "jaga", "Password protected" => "Parooliga kaitstud", +"Error unsetting expiration date" => "Viga aegumise kuupäeva eemaldamisel", +"Error setting expiration date" => "Viga aegumise kuupäeva määramisel", "ownCloud password reset" => "ownCloud parooli taastamine", "Use the following link to reset your password: {link}" => "Kasuta järgnevat linki oma parooli taastamiseks: {link}", "You will receive a link to reset your password via Email." => "Sinu parooli taastamise link saadetakse sulle e-postile.", +"Reset email send." => "Taastamise e-kiri on saadetud.", +"Request failed!" => "Päring ebaõnnestus!", "Username" => "Kasutajanimi", "Request reset" => "Päringu taastamine", "Your password was reset" => "Sinu parool on taastatud", @@ -80,6 +86,9 @@ "December" => "Detsember", "web services under your control" => "veebiteenused sinu kontrolli all", "Log out" => "Logi välja", +"Automatic logon rejected!" => "Automaatne sisselogimine lükati tagasi!", +"If you did not change your password recently, your account may be compromised!" => "Kui sa ei muutnud oma parooli hiljut, siis võib su kasutajakonto olla ohustatud!", +"Please change your password to secure your account again." => "Palun muuda parooli, et oma kasutajakonto uuesti turvata.", "Lost your password?" => "Kaotasid oma parooli?", "remember" => "pea meeles", "Log in" => "Logi sisse", diff --git a/core/l10n/fr.php b/core/l10n/fr.php index 597f58172d9..cdddea02b30 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -13,6 +13,8 @@ "Error while sharing" => "Erreur lors de la mise en partage", "Error while unsharing" => "Erreur lors de l'annulation du partage", "Error while changing permissions" => "Erreur lors du changement des permissions", +"Shared with you and the group {group} by {owner}" => "Partagé par {owner} avec vous et le groupe {group}", +"Shared with you by {owner}" => "Partagé avec vous par {owner}", "Share with" => "Partager avec", "Share with link" => "Partager via lien", "Password protect" => "Protéger par un mot de passe", @@ -22,6 +24,7 @@ "Share via email:" => "Partager via e-mail :", "No people found" => "Aucun utilisateur trouvé", "Resharing is not allowed" => "Le repartage n'est pas autorisé", +"Shared in {item} with {user}" => "Partagé dans {item} avec {user}", "Unshare" => "Ne plus partager", "can edit" => "édition autorisée", "access control" => "contrôle des accès", @@ -35,6 +38,8 @@ "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}", "You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe.", +"Reset email send." => "Mail de réinitialisation envoyé.", +"Request failed!" => "La requête a échoué !", "Username" => "Nom d'utilisateur", "Request reset" => "Demander la réinitialisation", "Your password was reset" => "Votre mot de passe a été réinitialisé", diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php index 3e0fd7dcd9f..28d2a3041f3 100644 --- a/core/l10n/ja_JP.php +++ b/core/l10n/ja_JP.php @@ -38,8 +38,8 @@ "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." => "メールã§ãƒ‘スワードをリセットã™ã‚‹ãƒªãƒ³ã‚¯ãŒå±Šãã¾ã™ã€‚", -"Reset email send." => "リセットメールé€ä¿¡", -"Request failed!" => "リクエスト失敗", +"Reset email send." => "リセットメールをé€ä¿¡ã—ã¾ã™ã€‚", +"Request failed!" => "リクエスト失敗ï¼", "Username" => "ユーザå", "Request reset" => "リセットをè¦æ±‚ã—ã¾ã™ã€‚", "Your password was reset" => "ã‚ãªãŸã®ãƒ‘スワードã¯ãƒªã‚»ãƒƒãƒˆã•ã‚Œã¾ã—ãŸã€‚", diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php index 1242109e35e..d210485fd9f 100644 --- a/core/l10n/nb_NO.php +++ b/core/l10n/nb_NO.php @@ -3,15 +3,31 @@ "No category to add?" => "Ingen kategorier Ã¥ legge til?", "This category already exists: " => "Denne kategorien finnes allerede:", "Settings" => "Innstillinger", +"Choose" => "Velg", "Cancel" => "Avbryt", "No" => "Nei", "Yes" => "Ja", "Ok" => "Ok", "No categories selected for deletion." => "Ingen kategorier merket for sletting.", "Error" => "Feil", +"Error while sharing" => "Feil under deling", +"Share with" => "Del med", +"Share with link" => "Del med link", +"Password protect" => "Passordbeskyttet", "Password" => "Passord", +"Set expiration date" => "Set utløpsdato", +"Expiration date" => "Utløpsdato", +"Share via email:" => "Del pÃ¥ epost", +"No people found" => "Ingen personer funnet", "Unshare" => "Avslutt deling", +"can edit" => "kan endre", +"access control" => "tilgangskontroll", "create" => "opprett", +"update" => "oppdater", +"delete" => "slett", +"share" => "del", +"Password protected" => "Passordbeskyttet", +"Error setting expiration date" => "Kan ikke sette utløpsdato", "ownCloud password reset" => "Tilbakestill ownCloud passord", "Use the following link to reset your password: {link}" => "Bruk følgende lenke for Ã¥ tilbakestille passordet ditt: {link}", "You will receive a link to reset your password via Email." => "Du burde motta detaljer om Ã¥ tilbakestille passordet ditt via epost.", @@ -63,10 +79,15 @@ "December" => "Desember", "web services under your control" => "nettjenester under din kontroll", "Log out" => "Logg ut", +"Automatic logon rejected!" => "Automatisk pÃ¥logging avvist!", +"If you did not change your password recently, your account may be compromised!" => "Hvis du ikke har endret passordet ditt nylig kan kontoen din være kompromitert", +"Please change your password to secure your account again." => "Vennligst skift passord for Ã¥ gjøre kontoen din sikker igjen.", "Lost your password?" => "Mistet passordet ditt?", "remember" => "husk", "Log in" => "Logg inn", "You are logged out." => "Du er logget ut", "prev" => "forrige", -"next" => "neste" +"next" => "neste", +"Security Warning!" => "Sikkerhetsadvarsel!", +"Verify" => "Verifiser" ); diff --git a/core/l10n/pl.php b/core/l10n/pl.php index 5ceb65534ce..18806af7945 100644 --- a/core/l10n/pl.php +++ b/core/l10n/pl.php @@ -38,6 +38,8 @@ "ownCloud password reset" => "restart hasÅ‚a", "Use the following link to reset your password: {link}" => "ProszÄ™ użyć tego odnoÅ›nika do zresetowania hasÅ‚a: {link}", "You will receive a link to reset your password via Email." => "OdnoÅ›nik sÅ‚użący do resetowania hasÅ‚a zostanie wysÅ‚any na adres e-mail.", +"Reset email send." => "WyÅ›lij zresetowany email.", +"Request failed!" => "Próba nieudana!", "Username" => "Nazwa użytkownika", "Request reset" => "Żądanie resetowania", "Your password was reset" => "Zresetowano hasÅ‚o", diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php index f40328407f9..f51c1a94c27 100644 --- a/core/l10n/pt_BR.php +++ b/core/l10n/pt_BR.php @@ -13,6 +13,8 @@ "Error while sharing" => "Erro ao compartilhar", "Error while unsharing" => "Erro ao descompartilhar", "Error while changing permissions" => "Erro ao mudar permissões", +"Shared with you and the group {group} by {owner}" => "Compartilhado com você e com o grupo {group} por {owner}", +"Shared with you by {owner}" => "Compartilhado com você por {owner}", "Share with" => "Compartilhar com", "Share with link" => "Compartilhar com link", "Password protect" => "Proteger com senha", @@ -22,6 +24,7 @@ "Share via email:" => "Compartilhar via e-mail:", "No people found" => "Nenhuma pessoa encontrada", "Resharing is not allowed" => "Não é permitido re-compartilhar", +"Shared in {item} with {user}" => "Compartilhado em {item} com {user}", "Unshare" => "Descompartilhar", "can edit" => "pode editar", "access control" => "controle de acesso", @@ -35,6 +38,8 @@ "ownCloud password reset" => "Redefinir senha ownCloud", "Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {link}", "You will receive a link to reset your password via Email." => "Você receberá um link para redefinir sua senha via e-mail.", +"Reset email send." => "Email de redefinição de senha enviado.", +"Request failed!" => "A requisição falhou!", "Username" => "Nome de Usuário", "Request reset" => "Pedido de reposição", "Your password was reset" => "Sua senha foi mudada", @@ -86,6 +91,8 @@ "December" => "Dezembro", "web services under your control" => "web services sob seu controle", "Log out" => "Sair", +"Automatic logon rejected!" => "Entrada Automática no Sistema Rejeitada!", +"If you did not change your password recently, your account may be compromised!" => "Se você não mudou a sua senha recentemente, a sua conta pode estar comprometida!", "Please change your password to secure your account again." => "Por favor troque sua senha para tornar sua conta segura novamente.", "Lost your password?" => "Esqueçeu sua senha?", "remember" => "lembrete", @@ -93,5 +100,7 @@ "You are logged out." => "Você está desconectado.", "prev" => "anterior", "next" => "próximo", -"Security Warning!" => "Aviso de Segurança!" +"Security Warning!" => "Aviso de Segurança!", +"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor, verifique a sua senha.<br />Por motivos de segurança, você deverá ser solicitado a muda-la ocasionalmente.", +"Verify" => "Verificar" ); diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php index c9daa645c47..f1c658830fc 100644 --- a/core/l10n/pt_PT.php +++ b/core/l10n/pt_PT.php @@ -38,6 +38,7 @@ "ownCloud password reset" => "Reposição da password ownCloud", "Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}", "You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password", +"Request failed!" => "O pedido falhou!", "Username" => "Utilizador", "Request reset" => "Pedir reposição", "Your password was reset" => "A sua password foi reposta", @@ -87,6 +88,7 @@ "December" => "Dezembro", "web services under your control" => "serviços web sob o seu controlo", "Log out" => "Sair", +"If you did not change your password recently, your account may be compromised!" => "Se não mudou a sua palavra-passe recentemente, a sua conta pode ter sido comprometida!", "Please change your password to secure your account again." => "Por favor mude a sua palavra-passe para assegurar a sua conta de novo.", "Lost your password?" => "Esqueceu a sua password?", "remember" => "lembrar", diff --git a/core/l10n/ru.php b/core/l10n/ru.php index 7131beff98b..ff5f30fbe18 100644 --- a/core/l10n/ru.php +++ b/core/l10n/ru.php @@ -38,6 +38,8 @@ "ownCloud password reset" => "Ð¡Ð±Ñ€Ð¾Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ ", "Use the following link to reset your password: {link}" => "ИÑпользуйте Ñледующую ÑÑылку чтобы ÑброÑить пароль: {link}", "You will receive a link to reset your password via Email." => "Ðа ваш Ð°Ð´Ñ€ÐµÑ Email выÑлана ÑÑылка Ð´Ð»Ñ ÑброÑа паролÑ.", +"Reset email send." => "Отправка пиÑьма Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÐµÐ¹ Ð´Ð»Ñ ÑброÑа.", +"Request failed!" => "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ðµ удалÑÑ!", "Username" => "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ", "Request reset" => "ЗапроÑить ÑброÑ", "Your password was reset" => "Ваш пароль был Ñброшен", diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php index a84b4d18f0f..610bb0b175b 100644 --- a/core/l10n/ru_RU.php +++ b/core/l10n/ru_RU.php @@ -38,6 +38,8 @@ "ownCloud password reset" => "Переназначение паролÑ", "Use the following link to reset your password: {link}" => "ВоÑпользуйтеÑÑŒ Ñледующей ÑÑылкой Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ: {link}", "You will receive a link to reset your password via Email." => "Ð’Ñ‹ получите ÑÑылку Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð¿Ð¾ Ñлектронной почте.", +"Reset email send." => "Ð¡Ð±Ñ€Ð¾Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ email.", +"Request failed!" => "Ðе удалоÑÑŒ выполнить запроÑ!", "Username" => "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ", "Request reset" => "Ð¡Ð±Ñ€Ð¾Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñа", "Your password was reset" => "Ваш пароль был переуÑтановлен", diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php index ad7ac98b8a8..9061274fb15 100644 --- a/core/l10n/si_LK.php +++ b/core/l10n/si_LK.php @@ -8,9 +8,23 @@ "Ok" => "හරි", "No categories selected for deletion." => "මක෠දà·à¶¸à·“ම සඳහ෠ප්â€à¶»à·€à¶»à·Šà¶œà¶ºà¶±à·Š à¶à·à¶»à· නොමà·à¶.", "Error" => "දà·à·‚යක්", +"Share with" => "බෙදà·à¶œà¶±à·Šà¶±", +"Share with link" => "යොමුවක් මඟින් බෙදà·à¶œà¶±à·Šà¶±", +"Password protect" => "මුර පදයකින් ආරක්à·à·à¶šà¶»à¶±à·Šà¶±", "Password" => "මුර පදය ", +"Set expiration date" => "කල් ඉකුà¶à·Š විමේ දිනය දමන්න", +"Expiration date" => "කල් ඉකුà¶à·Š විමේ දිනය", +"Share via email:" => "විද්â€à¶ºà·”à¶à·Š à¶à·à¶´à·‘ල මඟින් බෙදà·à¶œà¶±à·Šà¶±: ", "Unshare" => "නොබෙදු", +"can edit" => "සංස්කරණය කළ à·„à·à¶š", +"access control" => "ප්â€à¶»à·€à·šà· පà·à¶½à¶±à¶º", "create" => "සදන්න", +"delete" => "මකන්න", +"share" => "බෙදà·à·„දà·à¶œà¶±à·Šà¶±", +"Password protected" => "මුර පදයකින් ආරක්à·à·à¶šà¶» ඇà¶", +"Error unsetting expiration date" => "කල් ඉකුà¶à·Š දිනය ඉවà¶à·Š කිරීමේ දà·à·‚යක්", +"Error setting expiration date" => "කල් ඉකුà¶à·Š දිනය ස්ථà·à¶´à¶±à¶º කිරීමේ දà·à·‚යක්", +"Request failed!" => "ඉල්ලීම අසà·à¶»à·Šà¶®à¶šà¶ºà·’!", "Username" => "පරිà·à·“ලක නම", "To login page" => "පිවිසුම් පිටුවට", "New password" => "නව මුර පදයක්", @@ -19,10 +33,20 @@ "Apps" => "යෙදුම්", "Admin" => "පරිපà·à¶½à¶š", "Help" => "උදව්", +"Access forbidden" => "ඇà¶à·”ල් වීම à¶à·„නම්", +"Cloud not found" => "සොය෠ගචනොහà·à¶š", "Edit categories" => "ප්â€à¶»à¶·à·šà¶¯à¶ºà¶±à·Š සංස්කරණය", "Add" => "එක් කරන්න", +"Security Warning" => "ආරක්ෂක නිවේදනයක්", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ආරක්ෂිචඅහඹු සංඛ්â€à¶ºà· උà¶à·Šà¶´à·à¶¯à¶šà¶ºà¶šà·Š නොමà·à¶à·’ නම් ඔබගේ ගිණුමට පහරදෙන අයකුට එහි මුරපද යළි පිහිටුවීමට අවà·à·Šâ€à¶º ටà·à¶šà¶± පහසුවෙන් සොයà·à¶œà·™à¶± ඔබගේ ගිණුම පà·à·„à·à¶»à¶œà¶ à·„à·à¶š.", "Advanced" => "දියුණු/උසස්", "Data folder" => "දà¶à·Šà¶ à·†à·à¶½à·Šà¶©à¶»à¶º", +"Configure the database" => "දà¶à·Šà¶ සමුදà·à¶º à·„à·à¶©à¶œà·à·ƒà·“ම", +"Database user" => "දà¶à·Šà¶à¶œà¶¶à¶©à· භà·à·€à·’à¶à·à¶šà¶»à·”", +"Database password" => "දà¶à·Šà¶à¶œà¶¶à¶©à·à·€à·š මුරපදය", +"Database name" => "දà¶à·Šà¶à¶œà¶¶à¶©à·à·€à·š නම", +"Database host" => "දà¶à·Šà¶à¶œà¶¶à¶©à· සේවà·à¶¯à·à¶ºà¶šà¶ºà·", +"Finish setup" => "ස්ථà·à¶´à¶±à¶º කිරීම අවසන් කරන්න", "Sunday" => "ඉරිදà·", "Monday" => "සඳුදà·", "Tuesday" => "අඟහරුවà·à¶¯à·", @@ -43,5 +67,11 @@ "November" => "නොවà·à¶¸à·Šà¶¶à¶»à·Š", "December" => "දෙසà·à¶¸à·Šà¶¶à¶»à·Š", "web services under your control" => "ඔබට පà·à¶½à¶±à¶º කළ à·„à·à¶šà·’ වෙබ් සේවà·à·€à¶±à·Š", +"Log out" => "නික්මීම", +"Lost your password?" => "මුරපදය අමà¶à¶šà¶¯?", +"remember" => "මà¶à¶š à¶à¶¶à·à¶œà¶±à·Šà¶±", +"Log in" => "ප්â€à¶»à·€à·šà·à·€à¶±à·Šà¶±", +"You are logged out." => "ඔබ නික්මී ඇà¶.", +"prev" => "පෙර", "next" => "ඊළඟ" ); diff --git a/core/l10n/sv.php b/core/l10n/sv.php index 86c841bbaac..d10ee392fa8 100644 --- a/core/l10n/sv.php +++ b/core/l10n/sv.php @@ -38,6 +38,8 @@ "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}", "You will receive a link to reset your password via Email." => "Du fÃ¥r en länk att Ã¥terställa ditt lösenord via e-post.", +"Reset email send." => "Ã…terställ skickad e-post.", +"Request failed!" => "Begäran misslyckades!", "Username" => "Användarnamn", "Request reset" => "Begär Ã¥terställning", "Your password was reset" => "Ditt lösenord har Ã¥terställts", diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php index 808929b8f3e..faf82fd1f9c 100644 --- a/core/l10n/ta_LK.php +++ b/core/l10n/ta_LK.php @@ -38,6 +38,8 @@ "ownCloud password reset" => "ownCloud இன௠கடவà¯à®šà¯à®šà¯Šà®²à¯ மீளமைபà¯à®ªà¯", "Use the following link to reset your password: {link}" => "உஙà¯à®•à®³à¯ கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ மீளமைகà¯à®• பினà¯à®µà®°à¯à®®à¯ இணைபà¯à®ªà¯ˆ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà¯à®®à¯ : {இணைபà¯à®ªà¯}", "You will receive a link to reset your password via Email." => "நீஙà¯à®•à®³à¯ மினà¯à®©à®žà¯à®šà®²à¯ மூலம௠உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ மீளமைபà¯à®ªà®¤à®±à¯à®•à®¾à®© இணைபà¯à®ªà¯ˆ பெறà¯à®µà¯€à®°à¯à®•à®³à¯. ", +"Reset email send." => "மினà¯à®©à¯à®žà¯à®šà®²à¯ அனà¯à®ªà¯à®ªà¯à®¤à®²à¯ˆ மீளமைகà¯à®•à¯à®•", +"Request failed!" => "வேணà¯à®Ÿà¯à®•à¯‹à®³à¯ தோலà¯à®µà®¿à®¯à¯à®±à¯à®±à®¤à¯!", "Username" => "பயனாளர௠பெயரà¯", "Request reset" => "கோரிகà¯à®•à¯ˆ மீளமைபà¯à®ªà¯", "Your password was reset" => "உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ கடவà¯à®šà¯à®šà¯Šà®²à¯ மீளமைகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯", diff --git a/core/routes.php b/core/routes.php index cc0aa53a21e..6f999356689 100644 --- a/core/routes.php +++ b/core/routes.php @@ -13,9 +13,6 @@ $this->create('search_ajax_search', '/search/ajax/search.php') // AppConfig $this->create('core_ajax_appconfig', '/core/ajax/appconfig.php') ->actionInclude('core/ajax/appconfig.php'); -// RequestToken -$this->create('core_ajax_requesttoken', '/core/ajax/requesttoken.php') - ->actionInclude('core/ajax/requesttoken.php'); // Share $this->create('core_ajax_share', '/core/ajax/share.php') ->actionInclude('core/ajax/share.php'); diff --git a/core/templates/installation.php b/core/templates/installation.php index 5a3bd2cc9f0..a7c4780d5d1 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -73,7 +73,7 @@ <p>MySQL <?php echo $l->t( 'will be used' ); ?>.</p> <input type="hidden" id="dbtype" name="dbtype" value="mysql" /> <?php else: ?> - <input type="radio" name="dbtype" value="mysql" id="mysql" <?php OC_Helper::init_radio('dbtype','mysql', 'sqlite'); ?>/> + <input type="radio" name="dbtype" value="mysql" id="mysql" <?php OC_Helper::init_radio('dbtype', 'mysql', 'sqlite'); ?>/> <label class="mysql" for="mysql">MySQL</label> <?php endif; ?> <?php endif; ?> @@ -84,7 +84,7 @@ <input type="hidden" id="dbtype" name="dbtype" value="pgsql" /> <?php else: ?> <label class="pgsql" for="pgsql">PostgreSQL</label> - <input type="radio" name="dbtype" value='pgsql' id="pgsql" <?php OC_Helper::init_radio('dbtype','pgsql', 'sqlite'); ?>/> + <input type="radio" name="dbtype" value='pgsql' id="pgsql" <?php OC_Helper::init_radio('dbtype', 'pgsql', 'sqlite'); ?>/> <?php endif; ?> <?php endif; ?> @@ -94,7 +94,7 @@ <input type="hidden" id="dbtype" name="dbtype" value="oci" /> <?php else: ?> <label class="oci" for="oci">Oracle</label> - <input type="radio" name="dbtype" value='oci' id="oci" <?php OC_Helper::init_radio('dbtype','oci', 'sqlite'); ?>/> + <input type="radio" name="dbtype" value='oci' id="oci" <?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/> <?php endif; ?> <?php endif; ?> </div> diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index f78b6ff8bbd..d8f83058775 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -11,7 +11,6 @@ var oc_webroot = '<?php echo OC::$WEBROOT; ?>'; var oc_appswebroots = <?php echo $_['apps_paths'] ?>; var oc_requesttoken = '<?php echo $_['requesttoken']; ?>'; - var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>'; </script> <?php foreach ($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index e6468cdcfb4..2eaa517b324 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -11,7 +11,6 @@ var oc_webroot = '<?php echo OC::$WEBROOT; ?>'; var oc_appswebroots = <?php echo $_['apps_paths'] ?>; var oc_requesttoken = '<?php echo $_['requesttoken']; ?>'; - var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>'; var datepickerFormatDate = <?php echo json_encode($l->l('jsdate', 'jsdate')) ?>; var dayNames = <?php echo json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))) ?>; var monthNames = <?php echo json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))) ?>; diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index d876fbc98e8..451a4685e82 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -12,7 +12,6 @@ var oc_appswebroots = <?php echo $_['apps_paths'] ?>; var oc_current_user = '<?php echo OC_User::getUser() ?>'; var oc_requesttoken = '<?php echo $_['requesttoken']; ?>'; - var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>'; var datepickerFormatDate = <?php echo json_encode($l->l('jsdate', 'jsdate')) ?>; var dayNames = <?php echo json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))) ?>; var monthNames = <?php echo json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))) ?>; @@ -21,6 +20,13 @@ <?php foreach($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> <?php endforeach; ?> + <script type="text/javascript"> + requesttoken = '<?php echo $_['requesttoken']; ?>'; + OC.EventSource.requesttoken=requesttoken; + $(document).bind('ajaxSend', function(elm, xhr, s) { + xhr.setRequestHeader('requesttoken', requesttoken); + }); + </script> <?php foreach($_['headers'] as $header): ?> <?php echo '<'.$header['tag'].' '; @@ -30,7 +30,7 @@ class my_temporary_cron_class { // We use this function to handle (unexpected) shutdowns function handleUnexpectedShutdown() { // Delete lockfile - if( !my_temporary_cron_class::$keeplock && file_exists( my_temporary_cron_class::$lockfile )){ + if( !my_temporary_cron_class::$keeplock && file_exists( my_temporary_cron_class::$lockfile )) { unlink( my_temporary_cron_class::$lockfile ); } @@ -80,7 +80,7 @@ if( OC::$CLI ) { } // check if backgroundjobs is still running - if( file_exists( my_temporary_cron_class::$lockfile )){ + if( file_exists( my_temporary_cron_class::$lockfile )) { my_temporary_cron_class::$keeplock = true; my_temporary_cron_class::$sent = true; echo "Another instance of cron.php is still running!"; diff --git a/l10n/ar/files.po b/l10n/ar/files.po index 41dbb347101..3da28f2ec04 100644 --- a/l10n/ar/files.po +++ b/l10n/ar/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" @@ -52,15 +52,15 @@ msgstr "" msgid "Files" msgstr "الملÙات" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Ù…ØذوÙ" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "" @@ -100,116 +100,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "" -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "الاسم" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Øجم" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "معدل" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "" @@ -241,9 +241,9 @@ msgstr "" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "ØÙظ" #: templates/index.php:7 msgid "New" @@ -258,43 +258,43 @@ msgid "Folder" msgstr "مجلد" #: templates/index.php:11 -msgid "From url" +msgid "From link" msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "إرÙع" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "لا يوجد شيء هنا. إرÙع بعض الملÙات!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" -msgstr "" +msgstr "شارك" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "تØميل" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Øجم الترÙيع أعلى من المسموØ" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Øجم الملÙات التي تريد ترÙيعها أعلى من Ø§Ù„Ù…Ø³Ù…ÙˆØ Ø¹Ù„Ù‰ الخادم." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "" diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po index 769a5ee3411..505ab1c820d 100644 --- a/l10n/bg_BG/files.po +++ b/l10n/bg_BG/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" @@ -53,15 +53,15 @@ msgstr "Грешка при Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° диÑка" msgid "Files" msgstr "Файлове" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Изтриване" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "" @@ -101,116 +101,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "" -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Грешка при качване" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Качването е отменено." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Ðеправилно име – \"/\" не е позволено." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Име" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Размер" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Променено" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "" @@ -242,9 +242,9 @@ msgstr "0 означава без ограничение" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "ЗапиÑ" #: templates/index.php:7 msgid "New" @@ -259,43 +259,43 @@ msgid "Folder" msgstr "Папка" #: templates/index.php:11 -msgid "From url" -msgstr "От url-адреÑ" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Качване" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Отказване на качването" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "ÐÑма нищо, качете нещо!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "СподелÑне" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "ИзтеглÑне" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Файлът е прекалено голÑм" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Файловете които Ñе опитвате да качите Ñа по-големи от позволеното за Ñървъра." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Файловете Ñе претърÑват, изчакайте." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "" diff --git a/l10n/ca/files.po b/l10n/ca/files.po index a471f43bc67..dd41780d0d2 100644 --- a/l10n/ca/files.po +++ b/l10n/ca/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-20 02:02+0200\n" -"PO-Revision-Date: 2012-10-19 06:05+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-02 14:36+0000\n" "Last-Translator: rogerc <rcalvoi@yahoo.com>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" @@ -55,15 +55,15 @@ msgstr "Ha fallat en escriure al disc" msgid "Files" msgstr "Fitxers" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Deixa de compartir" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Suprimeix" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Reanomena" @@ -103,116 +103,116 @@ msgstr "no compartits {files}" msgid "deleted {files}" msgstr "eliminats {files}" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "s'estan generant fitxers ZIP, pot trigar una estona." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Error en la pujada" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Pendents" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "1 fitxer pujant" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "{count} fitxers en pujada" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "La pujada s'ha cancel·lat." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Hi ha una pujada en curs. Si abandoneu la pà gina la pujada es cancel·larà ." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "El nom no és và lid, no es permet '/'." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "{count} fitxers escannejats" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "error durant l'escaneig" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Nom" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Mida" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Modificat" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 carpeta" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{count} carpetes" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 fitxer" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{count} fitxers" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "segons enrere" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "fa 1 minut" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "fa {minutes} minuts" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "avui" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "ahir" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "fa {days} dies" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "el mes passat" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "mesos enrere" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "l'any passat" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "anys enrere" @@ -244,7 +244,7 @@ msgstr "0 és sense lÃmit" msgid "Maximum input size for ZIP files" msgstr "Mida mà xima d'entrada per fitxers ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Desa" @@ -261,43 +261,43 @@ msgid "Folder" msgstr "Carpeta" #: templates/index.php:11 -msgid "From url" -msgstr "Des de la url" +msgid "From link" +msgstr "Des d'enllaç" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Puja" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Cancel·la la pujada" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Res per aquÃ. Pugeu alguna cosa!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Comparteix" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Baixa" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "La pujada és massa gran" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Els fitxers que esteu intentant pujar excedeixen la mida mà xima de pujada del servidor" -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "S'estan escanejant els fitxers, espereu" -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Actualment escanejant" diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po index d9ac3c3cc9a..c644d68b523 100644 --- a/l10n/cs_CZ/files.po +++ b/l10n/cs_CZ/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-22 02:02+0200\n" -"PO-Revision-Date: 2012-10-21 07:01+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-02 07:02+0000\n" "Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -54,15 +54,15 @@ msgstr "Zápis na disk selhal" msgid "Files" msgstr "Soubory" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "ZruÅ¡it sdÃlenÃ" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Smazat" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "PÅ™ejmenovat" @@ -102,116 +102,116 @@ msgstr "sdÃlenà zruÅ¡eno pro {files}" msgid "deleted {files}" msgstr "smazáno {files}" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "generuji ZIP soubor, může to nÄ›jakou dobu trvat." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Chyba odesÃlánÃ" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "ÄŒekajÃcÃ" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "odesÃlá se 1 soubor" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "odesÃlám {count} souborů" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "OdesÃlánà zruÅ¡eno." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "ProbÃhá odesÃlánà souboru. OpuÅ¡tÄ›nà stránky vyústà ve zruÅ¡enà nahrávánÃ." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Neplatný název, znak '/' nenà povolen" -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "prozkoumáno {count} souborů" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "chyba pÅ™i prohledávánÃ" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Název" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Velikost" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "ZmÄ›nÄ›no" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 složka" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{count} složky" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 soubor" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{count} soubory" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "pÅ™ed pár sekundami" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "pÅ™ed 1 minutou" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "pÅ™ed {minutes} minutami" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "dnes" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "vÄera" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "pÅ™ed {days} dny" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "minulý mÄ›sÃc" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "pÅ™ed pár mÄ›sÃci" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "minulý rok" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "pÅ™ed pár lety" @@ -243,7 +243,7 @@ msgstr "0 znamená bez omezenÃ" msgid "Maximum input size for ZIP files" msgstr "Maximálnà velikost vstupu pro ZIP soubory" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Uložit" @@ -260,43 +260,43 @@ msgid "Folder" msgstr "Složka" #: templates/index.php:11 -msgid "From url" -msgstr "Z url" +msgid "From link" +msgstr "Z odkazu" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Odeslat" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "ZruÅ¡it odesÃlánÃ" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Žádný obsah. Nahrajte nÄ›co." -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "SdÃlet" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Stáhnout" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Odeslaný soubor je pÅ™ÃliÅ¡ velký" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Soubory, které se snažÃte odeslat, pÅ™ekraÄujà limit velikosti odesÃlánà na tomto serveru." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Soubory se prohledávajÃ, prosÃm Äekejte." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Aktuálnà prohledávánÃ" diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po index 0f20d9e72e1..6fc4812bb0b 100644 --- a/l10n/cs_CZ/files_external.po +++ b/l10n/cs_CZ/files_external.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-04 02:04+0200\n" -"PO-Revision-Date: 2012-10-03 08:09+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-02 10:04+0000\n" "Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -67,7 +67,7 @@ msgstr "Možnosti" #: templates/settings.php:11 msgid "Applicable" -msgstr "Platný" +msgstr "PÅ™Ãstupný pro" #: templates/settings.php:23 msgid "Add mount point" diff --git a/l10n/da/files.po b/l10n/da/files.po index dfc8be12e2e..06526d37e82 100644 --- a/l10n/da/files.po +++ b/l10n/da/files.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-20 02:02+0200\n" -"PO-Revision-Date: 2012-10-19 18:25+0000\n" -"Last-Translator: Ole Holm Frandsen <froksen@gmail.com>\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" +"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,15 +58,15 @@ msgstr "Fejl ved skrivning til disk." msgid "Files" msgstr "Filer" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Fjern deling" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Slet" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Omdøb" @@ -106,116 +106,116 @@ msgstr "ikke delte {files}" msgid "deleted {files}" msgstr "slettede {files}" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "genererer ZIP-fil, det kan tage lidt tid." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Kunne ikke uploade din fil, da det enten er en mappe eller er tom" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Fejl ved upload" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Afventer" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "1 fil uploades" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "{count} filer uploades" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Upload afbrudt." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Ugyldigt navn, '/' er ikke tilladt." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "{count} filer skannet" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "fejl under scanning" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Navn" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Størrelse" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Ændret" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 mappe" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{count} mapper" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 fil" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{count} filer" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "sekunder siden" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "1 minut siden" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "{minutes} minutter siden" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "i dag" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "i gÃ¥r" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "{days} dage siden" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "sidste mÃ¥ned" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "mÃ¥neder siden" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "sidste Ã¥r" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "Ã¥r siden" @@ -247,7 +247,7 @@ msgstr "0 er ubegrænset" msgid "Maximum input size for ZIP files" msgstr "Maksimal størrelse pÃ¥ ZIP filer" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Gem" @@ -264,43 +264,43 @@ msgid "Folder" msgstr "Mappe" #: templates/index.php:11 -msgid "From url" -msgstr "Fra URL" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Upload" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Fortryd upload" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Her er tomt. Upload noget!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Del" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Download" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Upload for stor" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload pÃ¥ denne server." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Filerne bliver indlæst, vent venligst." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Indlæser" diff --git a/l10n/de/core.po b/l10n/de/core.po index 13707ec23d4..4c9b9f4f270 100644 --- a/l10n/de/core.po +++ b/l10n/de/core.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-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-27 22:12+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" +"PO-Revision-Date: 2012-11-02 23:38+0000\n" +"Last-Translator: Mirodin <blobbyjj@ymail.com>\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" @@ -47,23 +47,23 @@ msgstr "Kategorie existiert bereits:" msgid "Settings" msgstr "Einstellungen" -#: js/oc-dialogs.js:123 +#: js/oc-dialogs.js:126 msgid "Choose" msgstr "Auswählen" -#: js/oc-dialogs.js:143 js/oc-dialogs.js:163 +#: js/oc-dialogs.js:146 js/oc-dialogs.js:166 msgid "Cancel" msgstr "Abbrechen" -#: js/oc-dialogs.js:159 +#: js/oc-dialogs.js:162 msgid "No" msgstr "Nein" -#: js/oc-dialogs.js:160 +#: js/oc-dialogs.js:163 msgid "Yes" msgstr "Ja" -#: js/oc-dialogs.js:177 +#: js/oc-dialogs.js:180 msgid "Ok" msgstr "OK" @@ -187,15 +187,15 @@ msgstr "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}" #: lostpassword/templates/lostpassword.php:3 msgid "You will receive a link to reset your password via Email." -msgstr "Du erhälst einen Link per E-Mail, um Dein Passwort zurückzusetzen." +msgstr "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen." #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "Die E-Mail zum Zurücksetzen wurde versendet." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "Die Anfrage schlug fehl!" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 #: templates/login.php:20 diff --git a/l10n/de/files.po b/l10n/de/files.po index 091c136ce07..9967d57d54b 100644 --- a/l10n/de/files.po +++ b/l10n/de/files.po @@ -23,9 +23,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-28 11:53+0000\n" -"Last-Translator: Jan-Christoph Borchardt <hey@jancborchardt.net>\n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" +"PO-Revision-Date: 2012-11-03 00:03+0000\n" +"Last-Translator: Mirodin <blobbyjj@ymail.com>\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,11 +67,11 @@ msgstr "Fehler beim Schreiben auf die Festplatte" msgid "Files" msgstr "Dateien" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Nicht mehr freigeben" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Löschen" @@ -160,15 +160,15 @@ msgstr "{count} Dateien wurden gescannt" msgid "error while scanning" msgstr "Fehler beim Scannen" -#: js/files.js:754 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Name" -#: js/files.js:755 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Größe" -#: js/files.js:756 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Bearbeitet" @@ -256,7 +256,7 @@ msgstr "0 bedeutet unbegrenzt" msgid "Maximum input size for ZIP files" msgstr "Maximale Größe für ZIP-Dateien" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Speichern" @@ -273,43 +273,43 @@ msgid "Folder" msgstr "Ordner" #: templates/index.php:11 -msgid "From url" -msgstr "Von einer URL" +msgid "From link" +msgstr "Von einem Link" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Hochladen" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Upload abbrechen" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Alles leer. Lade etwas hoch!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Freigabe" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Herunterladen" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Upload zu groß" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Dateien werden gescannt, bitte warten." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Scanne" diff --git a/l10n/de/lib.po b/l10n/de/lib.po index 81228d54afe..41eb7f70e19 100644 --- a/l10n/de/lib.po +++ b/l10n/de/lib.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-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-28 14:14+0000\n" -"Last-Translator: Jan-Christoph Borchardt <hey@jancborchardt.net>\n" +"POT-Creation-Date: 2012-11-02 00:04+0100\n" +"PO-Revision-Date: 2012-10-31 23:16+0000\n" +"Last-Translator: Mirodin <blobbyjj@ymail.com>\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" diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po index c738a1578d8..8407732a254 100644 --- a/l10n/de_DE/core.po +++ b/l10n/de_DE/core.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-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-28 12:40+0000\n" -"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n" +"POT-Creation-Date: 2012-11-02 00:04+0100\n" +"PO-Revision-Date: 2012-10-31 23:21+0000\n" +"Last-Translator: Mirodin <blobbyjj@ymail.com>\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -47,23 +47,23 @@ msgstr "Kategorie existiert bereits:" msgid "Settings" msgstr "Einstellungen" -#: js/oc-dialogs.js:123 +#: js/oc-dialogs.js:126 msgid "Choose" msgstr "Auswählen" -#: js/oc-dialogs.js:143 js/oc-dialogs.js:163 +#: js/oc-dialogs.js:146 js/oc-dialogs.js:166 msgid "Cancel" msgstr "Abbrechen" -#: js/oc-dialogs.js:159 +#: js/oc-dialogs.js:162 msgid "No" msgstr "Nein" -#: js/oc-dialogs.js:160 +#: js/oc-dialogs.js:163 msgid "Yes" msgstr "Ja" -#: js/oc-dialogs.js:177 +#: js/oc-dialogs.js:180 msgid "Ok" msgstr "OK" @@ -191,11 +191,11 @@ msgstr "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen." #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "E-Mail zum Zurücksetzen des Passworts gesendet." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "Die Anforderung schlug fehl!" +msgstr "Die Anfrage schlug fehl!" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 #: templates/login.php:20 diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po index dc9f5cb829b..ab1bb852bfa 100644 --- a/l10n/de_DE/files.po +++ b/l10n/de_DE/files.po @@ -24,9 +24,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-28 12:35+0000\n" -"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" +"PO-Revision-Date: 2012-11-02 23:50+0000\n" +"Last-Translator: Mirodin <blobbyjj@ymail.com>\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -68,11 +68,11 @@ msgstr "Fehler beim Schreiben auf die Festplatte" msgid "Files" msgstr "Dateien" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Nicht mehr freigeben" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Löschen" @@ -161,15 +161,15 @@ msgstr "{count} Dateien wurden gescannt" msgid "error while scanning" msgstr "Fehler beim Scannen" -#: js/files.js:754 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Name" -#: js/files.js:755 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Größe" -#: js/files.js:756 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Bearbeitet" @@ -257,7 +257,7 @@ msgstr "0 bedeutet unbegrenzt" msgid "Maximum input size for ZIP files" msgstr "Maximale Größe für ZIP-Dateien" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Speichern" @@ -274,43 +274,43 @@ msgid "Folder" msgstr "Ordner" #: templates/index.php:11 -msgid "From url" -msgstr "Von einer URL" +msgid "From link" +msgstr "Von einem Link" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Hochladen" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Upload abbrechen" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Alles leer. Bitte laden Sie etwas hoch!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Teilen" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Herunterladen" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Der Upload ist zu groß" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Dateien werden gescannt, bitte warten." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Scanne" diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po index bded7ec62ab..f9570f68125 100644 --- a/l10n/de_DE/lib.po +++ b/l10n/de_DE/lib.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-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-28 14:14+0000\n" -"Last-Translator: Jan-Christoph Borchardt <hey@jancborchardt.net>\n" +"POT-Creation-Date: 2012-11-02 00:04+0100\n" +"PO-Revision-Date: 2012-10-31 23:41+0000\n" +"Last-Translator: Mirodin <blobbyjj@ymail.com>\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/l10n/el/files.po b/l10n/el/files.po index ed407de12ea..c40ced8d6ae 100644 --- a/l10n/el/files.po +++ b/l10n/el/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-10-20 02:02+0200\n" -"PO-Revision-Date: 2012-10-19 18:28+0000\n" -"Last-Translator: Γιάννης Ανθυμίδης <yannanth@gmail.com>\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" +"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,15 +57,15 @@ msgstr "Αποτυχία εγγÏαφής στο δίσκο" msgid "Files" msgstr "ΑÏχεία" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Διακοπή κοινής χÏήσης" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "ΔιαγÏαφή" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Μετονομασία" @@ -105,116 +105,116 @@ msgstr "μη διαμοιÏασμÎνα {files}" msgid "deleted {files}" msgstr "διαγÏαμμÎνα {files}" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "παÏαγωγή αÏχείου ZIP, ίσως διαÏκÎσει αÏκετά." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Αδυναμία στην αποστολή του αÏχείου σας Î±Ï†Î¿Ï ÎµÎ¯Î½Î±Î¹ φάκελος ή Îχει 0 bytes" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Σφάλμα Αποστολής" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "ΕκκÏεμεί" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "1 αÏχείο ανεβαίνει" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "{count} αÏχεία ανεβαίνουν" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Η αποστολή ακυÏώθηκε." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Η αποστολή του αÏχείου βÏίσκεται σε εξÎλιξη. Έξοδος από την σελίδα Ï„ÏŽÏα θα ακυÏώσει την αποστολή." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Μη ÎγκυÏο όνομα, το '/' δεν επιτÏÎπεται." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "{count} αÏχεία ανιχνεÏτηκαν" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "σφάλμα κατά την ανίχνευση" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Όνομα" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "ÎœÎγεθος" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "ΤÏοποποιήθηκε" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 φάκελος" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{count} φάκελοι" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 αÏχείο" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{count} αÏχεία" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "δευτεÏόλεπτα Ï€Ïιν" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "1 λεπτό Ï€Ïιν" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "{minutes} λεπτά Ï€Ïιν" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "σήμεÏα" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "χτες" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "{days} ημÎÏες Ï€Ïιν" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "τελευταίο μήνα" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "μήνες Ï€Ïιν" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "τελευταίο χÏόνο" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "χÏόνια Ï€Ïιν" @@ -246,7 +246,7 @@ msgstr "0 για απεÏιόÏιστο" msgid "Maximum input size for ZIP files" msgstr "ÎœÎγιστο μÎγεθος για αÏχεία ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Αποθήκευση" @@ -263,43 +263,43 @@ msgid "Folder" msgstr "Φάκελος" #: templates/index.php:11 -msgid "From url" -msgstr "Από την διεÏθυνση" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Αποστολή" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "ΑκÏÏωση αποστολής" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Δεν υπάÏχει τίποτα εδώ. ΑνÎβασε κάτι!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "ΔιαμοιÏασμός" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Λήψη" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Î Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ αÏχείο Ï€Ïος αποστολή" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Τα αÏχεία που Ï€Ïοσπαθείτε να ανεβάσετε υπεÏβαίνουν το μÎγιστο μÎγεθος αποστολής αÏχείων σε αυτόν το διακομιστή." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Τα αÏχεία σαÏώνονται, παÏακαλώ πεÏιμÎνετε" -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "ΤÏÎχουσα αναζήτηση " diff --git a/l10n/eo/files.po b/l10n/eo/files.po index fc63676fdcb..65dafa2cb08 100644 --- a/l10n/eo/files.po +++ b/l10n/eo/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" @@ -53,15 +53,15 @@ msgstr "Malsukcesis skribo al disko" msgid "Files" msgstr "Dosieroj" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Malkunhavigi" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Forigi" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Alinomigi" @@ -101,116 +101,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "generanta ZIP-dosiero, Äi povas daÅri iom da tempo" -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Ne eblis alÅuti vian dosieron ĉar Äi estas dosierujo aÅ havas 0 duumokojn" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "AlÅuta eraro" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Traktotaj" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "1 dosiero estas alÅutata" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "La alÅuto nuliÄis." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "DosieralÅuto plenumiÄas. Lasi la paÄon nun nuligus la alÅuton." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Nevalida nomo, “/†ne estas permesata." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "eraro dum skano" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Nomo" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Grando" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Modifita" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "sekundoj antaÅe" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "antaÅ 1 minuto" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "hodiaÅ" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "hieraÅ" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "lastamonate" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "monatoj antaÅe" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "lastajare" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "jaroj antaÅe" @@ -242,7 +242,7 @@ msgstr "0 signifas senlime" msgid "Maximum input size for ZIP files" msgstr "Maksimuma enirgrando por ZIP-dosieroj" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Konservi" @@ -259,43 +259,43 @@ msgid "Folder" msgstr "Dosierujo" #: templates/index.php:11 -msgid "From url" -msgstr "El URL" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "AlÅuti" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Nuligi alÅuton" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Nenio estas ĉi tie. AlÅutu ion!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Kunhavigi" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "ElÅuti" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "ElÅuto tro larÄa" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "La dosieroj, kiujn vi provas alÅuti, transpasas la maksimuman grandon por dosieralÅutoj en ĉi tiu servilo." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Dosieroj estas skanataj, bonvolu atendi." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Nuna skano" diff --git a/l10n/es/core.po b/l10n/es/core.po index f3a68789150..e447add9847 100644 --- a/l10n/es/core.po +++ b/l10n/es/core.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <javierkaiser@gmail.com>, 2012. # Javier Llorente <javier@opensuse.org>, 2012. # <juanma@kde.org.ar>, 2011-2012. # oSiNaReF <>, 2012. @@ -10,15 +11,15 @@ # <rodrigo.calvo@gmail.com>, 2012. # <rom1dep@gmail.com>, 2011. # Rubén Trujillo <rubentrf@gmail.com>, 2012. -# <sergioballesterossolanas@gmail.com>, 2011, 2012. +# <sergioballesterossolanas@gmail.com>, 2011-2012. # <sergio@entrecables.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-27 22:12+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-11-01 00:01+0100\n" +"PO-Revision-Date: 2012-10-31 20:49+0000\n" +"Last-Translator: Javierkaiser <javierkaiser@gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,23 +43,23 @@ msgstr "Esta categorÃa ya existe: " msgid "Settings" msgstr "Ajustes" -#: js/oc-dialogs.js:123 +#: js/oc-dialogs.js:126 msgid "Choose" msgstr "Seleccionar" -#: js/oc-dialogs.js:143 js/oc-dialogs.js:163 +#: js/oc-dialogs.js:146 js/oc-dialogs.js:166 msgid "Cancel" msgstr "Cancelar" -#: js/oc-dialogs.js:159 +#: js/oc-dialogs.js:162 msgid "No" msgstr "No" -#: js/oc-dialogs.js:160 +#: js/oc-dialogs.js:163 msgid "Yes" msgstr "SÃ" -#: js/oc-dialogs.js:177 +#: js/oc-dialogs.js:180 msgid "Ok" msgstr "Aceptar" @@ -186,11 +187,11 @@ msgstr "Recibirás un enlace por correo electrónico para restablecer tu contras #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "Email de reconfiguración enviado." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "Pedido fallado!" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 #: templates/login.php:20 diff --git a/l10n/es/files.po b/l10n/es/files.po index 1ee3d8738f5..f94f8b1e311 100644 --- a/l10n/es/files.po +++ b/l10n/es/files.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <devianpctek@gmail.com>, 2012. # Javier Llorente <javier@opensuse.org>, 2012. # <juanma@kde.org.ar>, 2012. # Rubén Trujillo <rubentrf@gmail.com>, 2012. @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-20 02:02+0200\n" -"PO-Revision-Date: 2012-10-19 06:17+0000\n" -"Last-Translator: juanman <juanma@kde.org.ar>\n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" +"PO-Revision-Date: 2012-11-03 20:10+0000\n" +"Last-Translator: Luis Medina <devianpctek@gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -56,15 +57,15 @@ msgstr "La escritura en disco ha fallado" msgid "Files" msgstr "Archivos" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Dejar de compartir" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Eliminar" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Renombrar" @@ -104,116 +105,116 @@ msgstr "{files} descompartidos" msgid "deleted {files}" msgstr "{files} eliminados" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "generando un fichero ZIP, puede llevar un tiempo." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Error al subir el archivo" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Pendiente" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "subiendo 1 archivo" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "Subiendo {count} archivos" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Subida cancelada." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "La subida del archivo está en proceso. Salir de la página ahora cancelará la subida." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Nombre no válido, '/' no está permitido." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "{count} archivos escaneados" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "error escaneando" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Nombre" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Tamaño" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Modificado" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 carpeta" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{count} carpetas" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 archivo" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{count} archivos" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "hace segundos" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "hace 1 minuto" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "hace {minutes} minutos" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "hoy" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "ayer" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "hace {days} dÃas" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "mes pasado" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "hace meses" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "año pasado" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "hace años" @@ -245,7 +246,7 @@ msgstr "0 es ilimitado" msgid "Maximum input size for ZIP files" msgstr "Tamaño máximo para archivos ZIP de entrada" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Guardar" @@ -262,43 +263,43 @@ msgid "Folder" msgstr "Carpeta" #: templates/index.php:11 -msgid "From url" -msgstr "Desde la URL" +msgid "From link" +msgstr "Desde el enlace" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Subir" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Cancelar subida" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Aquà no hay nada. ¡Sube algo!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Compartir" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Descargar" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "El archivo es demasiado grande" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido por este servidor." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Se están escaneando los archivos, por favor espere." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Ahora escaneando" diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po index 0fe6cad4a73..2d5e3c74115 100644 --- a/l10n/es_AR/core.po +++ b/l10n/es_AR/core.po @@ -4,13 +4,14 @@ # # Translators: # <claudio.tessone@gmail.com>, 2012. +# <javierkaiser@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-27 22:12+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-11-01 00:01+0100\n" +"PO-Revision-Date: 2012-10-31 19:52+0000\n" +"Last-Translator: Javierkaiser <javierkaiser@gmail.com>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,23 +35,23 @@ msgstr "Esta categorÃa ya existe: " msgid "Settings" msgstr "Ajustes" -#: js/oc-dialogs.js:123 +#: js/oc-dialogs.js:126 msgid "Choose" msgstr "Elegir" -#: js/oc-dialogs.js:143 js/oc-dialogs.js:163 +#: js/oc-dialogs.js:146 js/oc-dialogs.js:166 msgid "Cancel" msgstr "Cancelar" -#: js/oc-dialogs.js:159 +#: js/oc-dialogs.js:162 msgid "No" msgstr "No" -#: js/oc-dialogs.js:160 +#: js/oc-dialogs.js:163 msgid "Yes" msgstr "SÃ" -#: js/oc-dialogs.js:177 +#: js/oc-dialogs.js:180 msgid "Ok" msgstr "Aceptar" @@ -178,11 +179,11 @@ msgstr "Vas a recibir un enlace por e-mail para restablecer tu contraseña" #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "Reiniciar envÃo de email." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "Error en el pedido!" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 #: templates/login.php:20 diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po index af07f9d1243..6c61d170a44 100644 --- a/l10n/es_AR/files.po +++ b/l10n/es_AR/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-27 00:01+0200\n" -"PO-Revision-Date: 2012-10-26 10:07+0000\n" -"Last-Translator: cjtess <claudio.tessone@gmail.com>\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" +"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,15 +52,15 @@ msgstr "Error al escribir en el disco" msgid "Files" msgstr "Archivos" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Dejar de compartir" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Borrar" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Cambiar nombre" @@ -100,116 +100,116 @@ msgstr "{files} se dejaron de compartir" msgid "deleted {files}" msgstr "{files} borrados" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "generando un archivo ZIP, puede llevar un tiempo." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "No fue posible subir el archivo porque es un directorio o porque su tamaño es 0 bytes" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Error al subir el archivo" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Pendiente" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "Subiendo 1 archivo" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "Subiendo {count} archivos" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "La subida fue cancelada" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "La subida del archivo está en proceso. Si salÃs de la página ahora, la subida se cancelará." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Nombre no válido, no se permite '/' en él." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "{count} archivos escaneados" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "error mientras se escaneaba" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Nombre" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Tamaño" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Modificado" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 directorio" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{count} directorios" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 archivo" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{count} archivos" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "segundos atrás" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "hace 1 minuto" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "hace {minutes} minutos" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "hoy" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "ayer" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "hace {days} dÃas" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "el mes pasado" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "meses atrás" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "el año pasado" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "años atrás" @@ -241,7 +241,7 @@ msgstr "0 significa ilimitado" msgid "Maximum input size for ZIP files" msgstr "Tamaño máximo para archivos ZIP de entrada" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Guardar" @@ -258,43 +258,43 @@ msgid "Folder" msgstr "Carpeta" #: templates/index.php:11 -msgid "From url" -msgstr "Desde la URL" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Subir" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Cancelar subida" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "No hay nada. ¡Subà contenido!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Compartir" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Descargar" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "El archivo es demasiado grande" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Los archivos que intentás subir sobrepasan el tamaño máximo " -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Se están escaneando los archivos, por favor esperá." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Escaneo actual" diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po index dada79a387a..257dcf7f65e 100644 --- a/l10n/et_EE/core.po +++ b/l10n/et_EE/core.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-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-27 22:12+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-10-30 00:01+0100\n" +"PO-Revision-Date: 2012-10-29 22:51+0000\n" +"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -81,7 +81,7 @@ msgstr "" #: js/share.js:153 msgid "Shared with you by {owner}" -msgstr "" +msgstr "Sinuga jagas {owner}" #: js/share.js:158 msgid "Share with" @@ -118,7 +118,7 @@ msgstr "Ãœhtegi inimest ei leitud" #: js/share.js:235 msgid "Resharing is not allowed" -msgstr "" +msgstr "Edasijagamine pole lubatud" #: js/share.js:271 msgid "Shared in {item} with {user}" @@ -158,11 +158,11 @@ msgstr "Parooliga kaitstud" #: js/share.js:525 msgid "Error unsetting expiration date" -msgstr "" +msgstr "Viga aegumise kuupäeva eemaldamisel" #: js/share.js:537 msgid "Error setting expiration date" -msgstr "" +msgstr "Viga aegumise kuupäeva määramisel" #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -178,11 +178,11 @@ msgstr "Sinu parooli taastamise link saadetakse sulle e-postile." #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "Taastamise e-kiri on saadetud." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "Päring ebaõnnestus!" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 #: templates/login.php:20 @@ -401,17 +401,17 @@ msgstr "Logi välja" #: templates/login.php:8 msgid "Automatic logon rejected!" -msgstr "" +msgstr "Automaatne sisselogimine lükati tagasi!" #: templates/login.php:9 msgid "" "If you did not change your password recently, your account may be " "compromised!" -msgstr "" +msgstr "Kui sa ei muutnud oma parooli hiljut, siis võib su kasutajakonto olla ohustatud!" #: templates/login.php:10 msgid "Please change your password to secure your account again." -msgstr "" +msgstr "Palun muuda parooli, et oma kasutajakonto uuesti turvata." #: templates/login.php:15 msgid "Lost your password?" diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po index 3b1f1d7c196..932d78a0007 100644 --- a/l10n/et_EE/files.po +++ b/l10n/et_EE/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-21 02:03+0200\n" -"PO-Revision-Date: 2012-10-20 20:06+0000\n" -"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" +"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,15 +52,15 @@ msgstr "Kettale kirjutamine ebaõnnestus" msgid "Files" msgstr "Failid" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Lõpeta jagamine" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Kustuta" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "ümber" @@ -100,116 +100,116 @@ msgstr "jagamata {files}" msgid "deleted {files}" msgstr "kustutatud {files}" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "ZIP-faili loomine, see võib veidi aega võtta." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Ãœleslaadimise viga" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Ootel" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "1 faili üleslaadimisel" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "{count} faili üleslaadimist" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Ãœleslaadimine tühistati." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Vigane nimi, '/' pole lubatud." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "{count} faili skännitud" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "viga skännimisel" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Nimi" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Suurus" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Muudetud" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 kaust" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{count} kausta" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 fail" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{count} faili" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "sekundit tagasi" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "1 minut tagasi" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "{minutes} minutit tagasi" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "täna" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "eile" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "{days} päeva tagasi" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "viimasel kuul" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "kuu tagasi" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "viimasel aastal" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "aastat tagasi" @@ -241,7 +241,7 @@ msgstr "0 tähendab piiramatut" msgid "Maximum input size for ZIP files" msgstr "Maksimaalne ZIP-faili sisestatava faili suurus" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Salvesta" @@ -258,43 +258,43 @@ msgid "Folder" msgstr "Kaust" #: templates/index.php:11 -msgid "From url" -msgstr "URL-ilt" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Lae üles" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Tühista üleslaadimine" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Siin pole midagi. Lae midagi üles!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Jaga" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Lae alla" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Ãœleslaadimine on liiga suur" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Faile skannitakse, palun oota" -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Praegune skannimine" diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po index e877c9e1c25..c0302f73c06 100644 --- a/l10n/et_EE/files_sharing.po +++ b/l10n/et_EE/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 <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-10-30 00:01+0100\n" +"PO-Revision-Date: 2012-10-29 22:43+0000\n" +"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,12 +29,12 @@ msgstr "Saada" #: templates/public.php:9 #, php-format msgid "%s shared the folder %s with you" -msgstr "" +msgstr "%s jagas sinuga kausta %s" #: templates/public.php:11 #, php-format msgid "%s shared the file %s with you" -msgstr "" +msgstr "%s jagas sinuga faili %s" #: templates/public.php:14 templates/public.php:30 msgid "Download" @@ -44,6 +44,6 @@ msgstr "Lae alla" msgid "No preview available for" msgstr "Eelvaadet pole saadaval" -#: templates/public.php:37 +#: templates/public.php:35 msgid "web services under your control" msgstr "veebitenused sinu kontrolli all" diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po index cf1cdb8ac11..f3425ee0563 100644 --- a/l10n/et_EE/lib.po +++ b/l10n/et_EE/lib.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-10-25 02:07+0200\n" -"PO-Revision-Date: 2012-10-24 00:11+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-10-30 00:01+0100\n" +"PO-Revision-Date: 2012-10-29 23:00+0000\n" +"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -80,47 +80,47 @@ msgstr "Tekst" #: search/provider/file.php:29 msgid "Images" -msgstr "" +msgstr "Pildid" -#: template.php:87 +#: template.php:103 msgid "seconds ago" msgstr "sekundit tagasi" -#: template.php:88 +#: template.php:104 msgid "1 minute ago" msgstr "1 minut tagasi" -#: template.php:89 +#: template.php:105 #, php-format msgid "%d minutes ago" msgstr "%d minutit tagasi" -#: template.php:92 +#: template.php:108 msgid "today" msgstr "täna" -#: template.php:93 +#: template.php:109 msgid "yesterday" msgstr "eile" -#: template.php:94 +#: template.php:110 #, php-format msgid "%d days ago" msgstr "%d päeva tagasi" -#: template.php:95 +#: template.php:111 msgid "last month" msgstr "eelmisel kuul" -#: template.php:96 +#: template.php:112 msgid "months ago" msgstr "kuud tagasi" -#: template.php:97 +#: template.php:113 msgid "last year" msgstr "eelmisel aastal" -#: template.php:98 +#: template.php:114 msgid "years ago" msgstr "aastat tagasi" diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po index 222220f925a..2066376eaa9 100644 --- a/l10n/et_EE/settings.po +++ b/l10n/et_EE/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-21 02:03+0200\n" -"PO-Revision-Date: 2012-10-20 20:25+0000\n" +"POT-Creation-Date: 2012-10-31 00:01+0100\n" +"PO-Revision-Date: 2012-10-29 23:12+0000\n" "Last-Translator: Rivo Zängov <eraser@eraser.ee>\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" @@ -19,69 +19,69 @@ msgstr "" "Language: et_EE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/apps/ocs.php:23 +#: ajax/apps/ocs.php:20 msgid "Unable to load list from App Store" msgstr "App Sotre'i nimekirja laadimine ebaõnnestus" -#: ajax/creategroup.php:12 +#: ajax/creategroup.php:10 msgid "Group already exists" msgstr "Grupp on juba olemas" -#: ajax/creategroup.php:21 +#: ajax/creategroup.php:19 msgid "Unable to add group" msgstr "Keela grupi lisamine" -#: ajax/enableapp.php:14 +#: ajax/enableapp.php:12 msgid "Could not enable app. " msgstr "Rakenduse sisselülitamine ebaõnnestus." -#: ajax/lostpassword.php:14 +#: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Kiri on salvestatud" -#: ajax/lostpassword.php:16 +#: ajax/lostpassword.php:14 msgid "Invalid email" msgstr "Vigane e-post" -#: ajax/openid.php:16 +#: ajax/openid.php:13 msgid "OpenID Changed" msgstr "OpenID on muudetud" -#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23 +#: ajax/openid.php:15 ajax/setlanguage.php:17 ajax/setlanguage.php:20 msgid "Invalid request" msgstr "Vigane päring" -#: ajax/removegroup.php:16 +#: ajax/removegroup.php:13 msgid "Unable to delete group" msgstr "Keela grupi kustutamine" -#: ajax/removeuser.php:18 ajax/setquota.php:18 ajax/togglegroups.php:15 +#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:12 msgid "Authentication error" msgstr "Autentimise viga" -#: ajax/removeuser.php:27 +#: ajax/removeuser.php:24 msgid "Unable to delete user" msgstr "Keela kasutaja kustutamine" -#: ajax/setlanguage.php:18 +#: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Keel on muudetud" -#: ajax/togglegroups.php:25 +#: ajax/togglegroups.php:22 #, php-format msgid "Unable to add user to group %s" msgstr "Kasutajat ei saa lisada gruppi %s" -#: ajax/togglegroups.php:31 +#: ajax/togglegroups.php:28 #, php-format msgid "Unable to remove user from group %s" msgstr "Kasutajat ei saa eemaldada grupist %s" -#: js/apps.js:28 js/apps.js:65 +#: js/apps.js:28 js/apps.js:67 msgid "Disable" msgstr "Lülita välja" -#: js/apps.js:28 js/apps.js:54 +#: js/apps.js:28 js/apps.js:55 msgid "Enable" msgstr "Lülita sisse" @@ -112,7 +112,7 @@ msgstr "Ajastatud töö" #: templates/admin.php:37 msgid "Execute one task with each page loaded" -msgstr "" +msgstr "Kävita igal lehe laadimisel üks ülesanne" #: templates/admin.php:43 msgid "" @@ -124,7 +124,7 @@ msgstr "" msgid "" "Use systems cron service. Call the cron.php file in the owncloud folder via " "a system cronjob once a minute." -msgstr "" +msgstr "Kasuta süsteemide cron teenust. Käivita owncloudi kaustas fail cron.php läbi süsteemi cronjobi kord minutis." #: templates/admin.php:56 msgid "Sharing" @@ -227,7 +227,7 @@ msgstr "Vasta" #: templates/personal.php:8 #, php-format msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>" -msgstr "" +msgstr "Sa oled kasutanud <strong>%s</strong> saadaolevast <strong>%s<strong>-st" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po index d955f91c9dd..ccccf7cb20a 100644 --- a/l10n/et_EE/user_ldap.po +++ b/l10n/et_EE/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-12 02:01+0200\n" -"PO-Revision-Date: 2012-09-11 10:46+0000\n" +"POT-Creation-Date: 2012-10-30 00:01+0100\n" +"PO-Revision-Date: 2012-10-29 22:48+0000\n" "Last-Translator: Rivo Zängov <eraser@eraser.ee>\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "Host" #: templates/settings.php:8 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" -msgstr "" +msgstr "Sa ei saa protokolli ära jätta, välja arvatud siis, kui sa nõuad SSL-ühendust. Sel juhul alusta eesliitega ldaps://" #: templates/settings.php:9 msgid "Base DN" @@ -33,7 +33,7 @@ msgstr "Baas DN" #: templates/settings.php:9 msgid "You can specify Base DN for users and groups in the Advanced tab" -msgstr "" +msgstr "Sa saad kasutajate ja gruppide baas DN-i määrata lisavalikute vahekaardilt" #: templates/settings.php:10 msgid "User DN" @@ -44,7 +44,7 @@ msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." -msgstr "" +msgstr "Klientkasutaja DN, kellega seotakse, nt. uid=agent,dc=näidis,dc=com. Anonüümseks ligipääsuks jäta DN ja parool tühjaks." #: templates/settings.php:11 msgid "Password" @@ -52,7 +52,7 @@ msgstr "Parool" #: templates/settings.php:11 msgid "For anonymous access, leave DN and Password empty." -msgstr "" +msgstr "Anonüümseks ligipääsuks jäta DN ja parool tühjaks." #: templates/settings.php:12 msgid "User Login Filter" @@ -63,7 +63,7 @@ msgstr "Kasutajanime filter" msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." -msgstr "" +msgstr "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime." #: templates/settings.php:12 #, php-format @@ -130,7 +130,7 @@ msgstr "Lülita SSL sertifikaadi kontrollimine välja." msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." -msgstr "" +msgstr "Kui ühendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma ownCloud serverisse." #: templates/settings.php:23 msgid "Not recommended, use for testing only." diff --git a/l10n/eu/files.po b/l10n/eu/files.po index df78927e47b..2e6c0476810 100644 --- a/l10n/eu/files.po +++ b/l10n/eu/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" @@ -53,15 +53,15 @@ msgstr "Errore bat izan da diskoan idazterakoan" msgid "Files" msgstr "Fitxategiak" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Ez partekatu" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Ezabatu" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Berrizendatu" @@ -101,116 +101,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "ZIP-fitxategia sortzen ari da, denbora har dezake" -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Igotzean errore bat suertatu da" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Zain" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "fitxategi 1 igotzen" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Igoera ezeztatuta" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Baliogabeko izena, '/' ezin da erabili. " -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "errore bat egon da eskaneatzen zen bitartean" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Izena" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Tamaina" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Aldatuta" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "segundu" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "orain dela minutu 1" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "gaur" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "atzo" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "joan den hilabetean" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "hilabete" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "joan den urtean" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "urte" @@ -242,7 +242,7 @@ msgstr "0 mugarik gabe esan nahi du" msgid "Maximum input size for ZIP files" msgstr "ZIP fitxategien gehienezko tamaina" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Gorde" @@ -259,43 +259,43 @@ msgid "Folder" msgstr "Karpeta" #: templates/index.php:11 -msgid "From url" -msgstr "URLtik" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Igo" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Ezeztatu igoera" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Ez dago ezer. Igo zerbait!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Elkarbanatu" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Deskargatu" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Igotakoa handiegia da" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Orain eskaneatzen ari da" diff --git a/l10n/fa/files.po b/l10n/fa/files.po index d233b6d46c0..e3433021178 100644 --- a/l10n/fa/files.po +++ b/l10n/fa/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -54,17 +54,17 @@ msgstr "نوشتن بر روی دیسک سخت ناموÙÙ‚ بود" msgid "Files" msgstr "Ùایل ها" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "پاک کردن" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" -msgstr "" +msgstr "تغییرنام" #: js/filelist.js:194 js/filelist.js:196 msgid "{new_name} already exists" @@ -102,118 +102,118 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "در Øال ساخت Ùایل Ùشرده ممکن است زمان زیادی به طول بیانجامد" -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "ناتوان در بارگذاری یا Ùایل یک پوشه است یا 0بایت دارد" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "خطا در بار گذاری" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "در انتظار" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "بار گذاری لغو شد" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "نام نامناسب '/' غیرÙعال است" -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "نام" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "اندازه" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "تغییر یاÙته" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" -msgstr "" +msgstr "ثانیه‌ها پیش" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "1 دقیقه پیش" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" -msgstr "" +msgstr "امروز" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" -msgstr "" +msgstr "دیروز" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" -msgstr "" +msgstr "ماه قبل" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" -msgstr "" +msgstr "ماه‌های قبل" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" -msgstr "" +msgstr "سال قبل" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" -msgstr "" +msgstr "سال‌های قبل" #: templates/admin.php:5 msgid "File handling" @@ -243,9 +243,9 @@ msgstr "0 نامØدود است" msgid "Maximum input size for ZIP files" msgstr "Øداکثرمقدار برای بار گزاری پرونده های Ùشرده" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "ذخیره" #: templates/index.php:7 msgid "New" @@ -260,43 +260,43 @@ msgid "Folder" msgstr "پوشه" #: templates/index.php:11 -msgid "From url" -msgstr "از نشانی" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "بارگذاری" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "متوق٠کردن بار گذاری" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "اینجا هیچ چیز نیست." -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "به اشتراک گذاری" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "بارگیری" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Øجم بارگذاری بسیار زیاد است" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Ùایلها بیش از Øد تعیین شده در این سرور هستند\nمترجم:با تغییر Ùایل php,ini میتوان این Ù…Øدودیت را برطر٠کرد" -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "پرونده ها در Øال بازرسی هستند لطÙا صبر کنید" -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "بازرسی کنونی" diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po index 90b5581d16f..7256ec65768 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-10-20 02:02+0200\n" -"PO-Revision-Date: 2012-10-19 18:31+0000\n" -"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" +"Last-Translator: I Robot <thomas.mueller@tmit.eu>\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" @@ -56,15 +56,15 @@ msgstr "Levylle kirjoitus epäonnistui" msgid "Files" msgstr "Tiedostot" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" -msgstr "" +msgstr "Peru jakaminen" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Poista" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Nimeä uudelleen" @@ -104,116 +104,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "luodaan ZIP-tiedostoa, tämä saattaa kestää hetken." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Lähetysvirhe." -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Odottaa" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Lähetys peruttu." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Virheellinen nimi, merkki '/' ei ole sallittu." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Nimi" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Koko" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Muutettu" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 kansio" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{count} kansiota" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 tiedosto" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{count} tiedostoa" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "sekuntia sitten" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "1 minuutti sitten" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "{minutes} minuuttia sitten" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "tänään" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "eilen" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "{days} päivää sitten" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "viime kuussa" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "kuukautta sitten" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "viime vuonna" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "vuotta sitten" @@ -245,7 +245,7 @@ msgstr "0 on rajoittamaton" msgid "Maximum input size for ZIP files" msgstr "ZIP-tiedostojen enimmäiskoko" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Tallenna" @@ -262,43 +262,43 @@ msgid "Folder" msgstr "Kansio" #: templates/index.php:11 -msgid "From url" -msgstr "Verkko-osoitteesta" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Lähetä" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Peru lähetys" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Täällä ei ole mitään. Lähetä tänne jotakin!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Jaa" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Lataa" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Lähetettävä tiedosto on liian suuri" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Tiedostoja tarkistetaan, odota hetki." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Tämänhetkinen tutkinta" diff --git a/l10n/fr/core.po b/l10n/fr/core.po index 1aa23fd8542..42ff195cc90 100644 --- a/l10n/fr/core.po +++ b/l10n/fr/core.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-27 22:12+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" +"PO-Revision-Date: 2012-11-03 11:37+0000\n" +"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,23 +41,23 @@ msgstr "Cette catégorie existe déjà : " msgid "Settings" msgstr "Paramètres" -#: js/oc-dialogs.js:123 +#: js/oc-dialogs.js:126 msgid "Choose" msgstr "Choisir" -#: js/oc-dialogs.js:143 js/oc-dialogs.js:163 +#: js/oc-dialogs.js:146 js/oc-dialogs.js:166 msgid "Cancel" msgstr "Annuler" -#: js/oc-dialogs.js:159 +#: js/oc-dialogs.js:162 msgid "No" msgstr "Non" -#: js/oc-dialogs.js:160 +#: js/oc-dialogs.js:163 msgid "Yes" msgstr "Oui" -#: js/oc-dialogs.js:177 +#: js/oc-dialogs.js:180 msgid "Ok" msgstr "Ok" @@ -84,11 +84,11 @@ msgstr "Erreur lors du changement des permissions" #: js/share.js:151 msgid "Shared with you and the group {group} by {owner}" -msgstr "" +msgstr "Partagé par {owner} avec vous et le groupe {group}" #: js/share.js:153 msgid "Shared with you by {owner}" -msgstr "" +msgstr "Partagé avec vous par {owner}" #: js/share.js:158 msgid "Share with" @@ -129,7 +129,7 @@ msgstr "Le repartage n'est pas autorisé" #: js/share.js:271 msgid "Shared in {item} with {user}" -msgstr "" +msgstr "Partagé dans {item} avec {user}" #: js/share.js:292 msgid "Unshare" @@ -185,11 +185,11 @@ msgstr "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votr #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "Mail de réinitialisation envoyé." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "La requête a échoué !" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 #: templates/login.php:20 diff --git a/l10n/fr/files.po b/l10n/fr/files.po index 82b79b8f506..dbfd621a751 100644 --- a/l10n/fr/files.po +++ b/l10n/fr/files.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-27 00:01+0200\n" -"PO-Revision-Date: 2012-10-26 07:25+0000\n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" +"PO-Revision-Date: 2012-11-03 11:39+0000\n" "Last-Translator: Romain DEP. <rom1dep@gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" @@ -61,15 +61,15 @@ msgstr "Erreur d'écriture sur le disque" msgid "Files" msgstr "Fichiers" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Ne plus partager" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Supprimer" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Renommer" @@ -109,116 +109,116 @@ msgstr "Fichiers non partagés : {files}" msgid "deleted {files}" msgstr "Fichiers supprimés : {files}" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "Fichier ZIP en cours d'assemblage ; cela peut prendre du temps." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet." -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Erreur de chargement" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "En cours" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "1 fichier en cours de téléchargement" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "{count} fichiers téléversés" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Chargement annulé." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Nom invalide, '/' n'est pas autorisé." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "{count} fichiers indexés" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "erreur lors de l'indexation" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Nom" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Taille" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Modifié" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 dossier" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{count} dossiers" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 fichier" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{count} fichiers" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "secondes passées" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "Il y a une minute" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "Il y a {minutes} minutes" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "aujourd'hui" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "hier" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "Il y a {days} jours" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "mois dernier" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "mois passés" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "année dernière" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "années passées" @@ -250,7 +250,7 @@ msgstr "0 est illimité" msgid "Maximum input size for ZIP files" msgstr "Taille maximale pour les fichiers ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Sauvegarder" @@ -267,43 +267,43 @@ msgid "Folder" msgstr "Dossier" #: templates/index.php:11 -msgid "From url" -msgstr "Depuis URL" +msgid "From link" +msgstr "Depuis le lien" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Envoyer" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Annuler l'envoi" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Partager" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Téléchargement" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Fichier trop volumineux" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Les fichiers sont en cours d'analyse, veuillez patienter." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Analyse en cours" diff --git a/l10n/gl/files.po b/l10n/gl/files.po index 921dfdb0a6c..3172e4823fd 100644 --- a/l10n/gl/files.po +++ b/l10n/gl/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" @@ -53,15 +53,15 @@ msgstr "Erro ao escribir no disco" msgid "Files" msgstr "Ficheiros" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Deixar de compartir" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Eliminar" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "" @@ -101,118 +101,118 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "xerando ficheiro ZIP, pode levar un anaco." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Non se puido subir o ficheiro pois ou é un directorio ou ten 0 bytes" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Erro na subida" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Pendentes" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Subida cancelada." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "A subida do ficheiro está en curso. SaÃr agora da páxina cancelará a subida." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Nome non válido, '/' non está permitido." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "erro mentras analizaba" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Nome" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Tamaño" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Modificado" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" -msgstr "" +msgstr "hai segundos" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "hai 1 minuto" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" -msgstr "" +msgstr "hoxe" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" -msgstr "" +msgstr "onte" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" -msgstr "" +msgstr "último mes" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" -msgstr "" +msgstr "meses atrás" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" -msgstr "" +msgstr "último ano" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" -msgstr "" +msgstr "anos atrás" #: templates/admin.php:5 msgid "File handling" @@ -242,7 +242,7 @@ msgstr "0 significa ilimitado" msgid "Maximum input size for ZIP files" msgstr "Tamaño máximo de descarga para os ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Gardar" @@ -259,43 +259,43 @@ msgid "Folder" msgstr "Cartafol" #: templates/index.php:11 -msgid "From url" -msgstr "Desde url" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Enviar" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Cancelar subida" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Nada por aquÃ. EnvÃe algo." -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Compartir" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Descargar" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "EnvÃo demasiado grande" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Os ficheiros que trata de subir superan o tamaño máximo permitido neste servidor" -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Estanse analizando os ficheiros, espere por favor." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Análise actual." diff --git a/l10n/he/files.po b/l10n/he/files.po index 79a6e6383d0..e58ddbe0b7f 100644 --- a/l10n/he/files.po +++ b/l10n/he/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" @@ -55,15 +55,15 @@ msgstr "הכתיבה ×œ×›×•× ×Ÿ × ×›×©×œ×”" msgid "Files" msgstr "קבצי×" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" -msgstr "" +msgstr "הסר שיתוף" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "מחיקה" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "" @@ -103,118 +103,118 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "יוצר קובץ ZIP, ×× × ×”×ž×ª×Ÿ." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "×œ× ×™×›×•×œ להעלות ×ת הקובץ מכיוון שזו תקיה ×ו שמשקל הקובץ 0 בתי×" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "שגי×ת העל××”" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "ממתין" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "ההעל××” בוטלה." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "×©× ×œ× ×—×•×§×™, '/' ×סור לשימוש." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "ש×" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "גודל" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "זמן ×©×™× ×•×™" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" -msgstr "" +msgstr "×©× ×™×•×ª" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "×œ×¤× ×™ דקה ×חת" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" -msgstr "" +msgstr "היו×" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" -msgstr "" +msgstr "×תמול" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" -msgstr "" +msgstr "חודש שעבר" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" -msgstr "" +msgstr "חודשי×" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" -msgstr "" +msgstr "×©× ×” שעברה" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" -msgstr "" +msgstr "×©× ×™×" #: templates/admin.php:5 msgid "File handling" @@ -244,9 +244,9 @@ msgstr "0 - ×œ×œ× ×”×’×‘×œ×”" msgid "Maximum input size for ZIP files" msgstr "גודל הקלט המרבי לקובצי ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "שמירה" #: templates/index.php:7 msgid "New" @@ -261,43 +261,43 @@ msgid "Folder" msgstr "תיקייה" #: templates/index.php:11 -msgid "From url" -msgstr "מכתובת" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "העל××”" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "ביטול ההעל××”" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "×ין ×›×ן ×©×•× ×“×‘×¨. ×ולי ×‘×¨×¦×•× ×š להעלות משהו?" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "שיתוף" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "הורדה" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "העל××” גדולה מידי" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "×”×§×‘×¦×™× ×©× ×™×¡×™×ª להעלות חרגו מהגודל המקסימלי להעל×ת ×§×‘×¦×™× ×¢×œ שרת ×–×”." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "×”×§×‘×¦×™× × ×¡×¨×§×™×, × × ×œ×”×ž×ª×™×Ÿ." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "הסריקה ×”× ×•×›×—×™×ª" diff --git a/l10n/hi/files.po b/l10n/hi/files.po index 3c4dcbde822..6119f82e0f0 100644 --- a/l10n/hi/files.po +++ b/l10n/hi/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -51,15 +51,15 @@ msgstr "" msgid "Files" msgstr "" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "" @@ -99,116 +99,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "" -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "" @@ -240,7 +240,7 @@ msgstr "" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "" @@ -257,43 +257,43 @@ msgid "Folder" msgstr "" #: templates/index.php:11 -msgid "From url" +msgid "From link" msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "" diff --git a/l10n/hr/files.po b/l10n/hr/files.po index e413d22d1d0..df12af3629e 100644 --- a/l10n/hr/files.po +++ b/l10n/hr/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" @@ -54,15 +54,15 @@ msgstr "Neuspjelo pisanje na disk" msgid "Files" msgstr "Datoteke" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Prekini djeljenje" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "BriÅ¡i" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Promjeni ime" @@ -102,116 +102,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "generiranje ZIP datoteke, ovo može potrajati." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Nemoguće poslati datoteku jer je prazna ili je direktorij" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "PogreÅ¡ka pri slanju" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "U tijeku" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "1 datoteka se uÄitava" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Slanje poniÅ¡teno." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "UÄitavanje datoteke. NapuÅ¡tanjem stranice će prekinuti uÄitavanje." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Neispravan naziv, znak '/' nije dozvoljen." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "greÄka prilikom skeniranja" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Naziv" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "VeliÄina" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Zadnja promjena" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "sekundi prije" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "danas" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "juÄer" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "proÅ¡li mjesec" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "mjeseci" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "proÅ¡lu godinu" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "godina" @@ -243,7 +243,7 @@ msgstr "0 je \"bez limita\"" msgid "Maximum input size for ZIP files" msgstr "Maksimalna veliÄina za ZIP datoteke" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Snimi" @@ -260,43 +260,43 @@ msgid "Folder" msgstr "mapa" #: templates/index.php:11 -msgid "From url" -msgstr "od URL-a" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "PoÅ¡alji" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Prekini upload" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Nema niÄega u ovoj mapi. PoÅ¡alji neÅ¡to!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "podjeli" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Preuzmi" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Prijenos je preobiman" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Datoteke koje pokuÅ¡avate prenijeti prelaze maksimalnu veliÄinu za prijenos datoteka na ovom poslužitelju." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Datoteke se skeniraju, molimo priÄekajte." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Trenutno skeniranje" diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po index 85989e32f87..687536d74bf 100644 --- a/l10n/hu_HU/files.po +++ b/l10n/hu_HU/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" @@ -54,15 +54,15 @@ msgstr "Nem Ãrható lemezre" msgid "Files" msgstr "Fájlok" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" -msgstr "" +msgstr "Nem oszt meg" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Törlés" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "" @@ -102,118 +102,118 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "ZIP-fájl generálása, ez eltarthat egy ideig." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Nem tölthetÅ‘ fel, mert mappa volt, vagy 0 byte méretű" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Feltöltési hiba" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Folyamatban" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Feltöltés megszakÃtva" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Érvénytelen név, a '/' nem megengedett" -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Név" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Méret" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "MódosÃtva" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" -msgstr "" +msgstr "másodperccel ezelÅ‘tt" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "1 perccel ezelÅ‘tt" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" -msgstr "" +msgstr "ma" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" -msgstr "" +msgstr "tegnap" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" -msgstr "" +msgstr "múlt hónapban" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" -msgstr "" +msgstr "hónappal ezelÅ‘tt" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" -msgstr "" +msgstr "tavaly" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" -msgstr "" +msgstr "évvel ezelÅ‘tt" #: templates/admin.php:5 msgid "File handling" @@ -243,9 +243,9 @@ msgstr "0 = korlátlan" msgid "Maximum input size for ZIP files" msgstr "ZIP file-ok maximum mérete" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Mentés" #: templates/index.php:7 msgid "New" @@ -260,43 +260,43 @@ msgid "Folder" msgstr "Mappa" #: templates/index.php:11 -msgid "From url" -msgstr "URL-bÅ‘l" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Feltöltés" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Feltöltés megszakÃtása" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Töltsön fel egy fájlt." -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Megosztás" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Letöltés" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Feltöltés túl nagy" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "A fájlokat amit próbálsz feltölteni meghaladta a legnagyobb fájlméretet ezen a szerveren." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "File-ok vizsgálata, kis türelmet" -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Aktuális vizsgálat" diff --git a/l10n/ia/files.po b/l10n/ia/files.po index 4fdf1cd3cb5..410ed063369 100644 --- a/l10n/ia/files.po +++ b/l10n/ia/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" @@ -43,7 +43,7 @@ msgstr "Nulle file esseva incargate" #: ajax/upload.php:25 msgid "Missing a temporary folder" -msgstr "" +msgstr "Manca un dossier temporari" #: ajax/upload.php:26 msgid "Failed to write to disk" @@ -53,15 +53,15 @@ msgstr "" msgid "Files" msgstr "Files" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Deler" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "" @@ -101,116 +101,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "" -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Nomine" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Dimension" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Modificate" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "" @@ -242,9 +242,9 @@ msgstr "" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Salveguardar" #: templates/index.php:7 msgid "New" @@ -259,43 +259,43 @@ msgid "Folder" msgstr "Dossier" #: templates/index.php:11 -msgid "From url" +msgid "From link" msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Incargar" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Nihil hic. Incarga alcun cosa!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" -msgstr "" +msgstr "Compartir" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Discargar" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Incargamento troppo longe" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "" diff --git a/l10n/id/files.po b/l10n/id/files.po index bace353f309..2d22dd4a218 100644 --- a/l10n/id/files.po +++ b/l10n/id/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -54,15 +54,15 @@ msgstr "Gagal menulis ke disk" msgid "Files" msgstr "Berkas" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" -msgstr "" +msgstr "batalkan berbagi" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Hapus" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "" @@ -102,118 +102,118 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "membuat berkas ZIP, ini mungkin memakan waktu." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Gagal mengunggah berkas anda karena berupa direktori atau mempunyai ukuran 0 byte" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Terjadi Galat Pengunggahan" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Menunggu" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Pengunggahan dibatalkan." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Kesalahan nama, '/' tidak diijinkan." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Nama" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Ukuran" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Dimodifikasi" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" -msgstr "" +msgstr "beberapa detik yang lalu" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "1 menit lalu" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" -msgstr "" +msgstr "hari ini" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" -msgstr "" +msgstr "kemarin" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" -msgstr "" +msgstr "bulan kemarin" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" -msgstr "" +msgstr "beberapa bulan lalu" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" -msgstr "" +msgstr "tahun kemarin" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" -msgstr "" +msgstr "beberapa tahun lalu" #: templates/admin.php:5 msgid "File handling" @@ -243,9 +243,9 @@ msgstr "0 adalah tidak terbatas" msgid "Maximum input size for ZIP files" msgstr "Ukuran masukan maksimal untuk berkas ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "simpan" #: templates/index.php:7 msgid "New" @@ -260,43 +260,43 @@ msgid "Folder" msgstr "Folder" #: templates/index.php:11 -msgid "From url" -msgstr "Dari url" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Unggah" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Batal mengunggah" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Bagikan" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Unduh" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Unggahan terlalu besar" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Berkas yang anda coba unggah melebihi ukuran maksimum untuk pengunggahan berkas di server ini." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Berkas sedang dipindai, silahkan tunggu." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Sedang memindai" diff --git a/l10n/it/files.po b/l10n/it/files.po index bcc3820f7a0..ab99f375484 100644 --- a/l10n/it/files.po +++ b/l10n/it/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-20 02:02+0200\n" -"PO-Revision-Date: 2012-10-19 05:46+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-02 15:47+0000\n" "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" @@ -55,15 +55,15 @@ msgstr "Scrittura su disco non riuscita" msgid "Files" msgstr "File" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Rimuovi condivisione" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Elimina" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Rinomina" @@ -103,116 +103,116 @@ msgstr "non condivisi {files}" msgid "deleted {files}" msgstr "eliminati {files}" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "creazione file ZIP, potrebbe richiedere del tempo." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Errore di invio" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "In corso" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "1 file in fase di caricamento" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "{count} file in fase di caricamentoe" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Invio annullato" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Nome non valido" -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "{count} file analizzati" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "errore durante la scansione" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Nome" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Dimensione" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Modificato" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 cartella" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{count} cartelle" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 file" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{count} file" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "secondi fa" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "1 minuto fa" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "{minutes} minuti fa" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "oggi" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "ieri" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "{days} giorni fa" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "mese scorso" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "mesi fa" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "anno scorso" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "anni fa" @@ -244,7 +244,7 @@ msgstr "0 è illimitato" msgid "Maximum input size for ZIP files" msgstr "Dimensione massima per i file ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Salva" @@ -261,43 +261,43 @@ msgid "Folder" msgstr "Cartella" #: templates/index.php:11 -msgid "From url" -msgstr "Da URL" +msgid "From link" +msgstr "Da collegamento" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Carica" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Annulla invio" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Non c'è niente qui. Carica qualcosa!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Condividi" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Scarica" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Il file caricato è troppo grande" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "I file che stai provando a caricare superano la dimensione massima consentita su questo server." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Scansione dei file in corso, attendi" -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Scansione corrente" diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po index 4fb2e9f7d5d..15e9ac22c23 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-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-28 14:50+0000\n" -"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n" +"POT-Creation-Date: 2012-10-30 00:01+0100\n" +"PO-Revision-Date: 2012-10-29 04:16+0000\n" +"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\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" @@ -179,11 +179,11 @@ msgstr "メールã§ãƒ‘スワードをリセットã™ã‚‹ãƒªãƒ³ã‚¯ãŒå±Šãã¾ã™ #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "リセットメールé€ä¿¡" +msgstr "リセットメールをé€ä¿¡ã—ã¾ã™ã€‚" #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "リクエスト失敗" +msgstr "リクエスト失敗ï¼" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 #: templates/login.php:20 diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po index bec1c848423..6d3d13e4353 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-10-23 02:02+0200\n" -"PO-Revision-Date: 2012-10-22 11:03+0000\n" -"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" +"Last-Translator: I Robot <thomas.mueller@tmit.eu>\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" @@ -53,15 +53,15 @@ msgstr "ディスクã¸ã®æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ" msgid "Files" msgstr "ファイル" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "共有ã—ãªã„" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "削除" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "åå‰ã®å¤‰æ›´" @@ -101,116 +101,116 @@ msgstr "未共有 {files}" msgid "deleted {files}" msgstr "削除 {files}" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "ZIPファイルを生æˆä¸ã§ã™ã€ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„。" -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "アップãƒãƒ¼ãƒ‰ä½¿ç”¨ã¨ã—ã¦ã„るファイルãŒãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã€ã‚‚ã—ãã¯ã‚µã‚¤ã‚ºãŒ0ãƒã‚¤ãƒˆã®ãŸã‚ã€ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“。" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "アップãƒãƒ¼ãƒ‰ã‚¨ãƒ©ãƒ¼" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "ä¿ç•™" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "ファイルを1ã¤ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ä¸" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "{count} ファイルをアップãƒãƒ¼ãƒ‰ä¸" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "アップãƒãƒ¼ãƒ‰ã¯ã‚ャンセルã•ã‚Œã¾ã—ãŸã€‚" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "ファイル転é€ã‚’実行ä¸ã§ã™ã€‚今ã“ã®ãƒšãƒ¼ã‚¸ã‹ã‚‰ç§»å‹•ã™ã‚‹ã¨ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ãŒä¸æ¢ã•ã‚Œã¾ã™ã€‚" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "無効ãªåå‰ã€'/' ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“。" -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "{count} ファイルをスã‚ャン" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "スã‚ャンä¸ã®ã‚¨ãƒ©ãƒ¼" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "åå‰" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "サイズ" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "更新日時" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 フォルダ" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{count} フォルダ" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 ファイル" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{count} ファイル" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "秒å‰" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "1 分å‰" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "{minutes} 分å‰" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "今日" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "昨日" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "{days} æ—¥å‰" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "一月å‰" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "月å‰" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "一年å‰" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "å¹´å‰" @@ -242,7 +242,7 @@ msgstr "0を指定ã—ãŸå ´åˆã¯ç„¡åˆ¶é™" msgid "Maximum input size for ZIP files" msgstr "ZIPファイルã¸ã®æœ€å¤§å…¥åŠ›ã‚µã‚¤ã‚º" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "ä¿å˜" @@ -259,43 +259,43 @@ msgid "Folder" msgstr "フォルダ" #: templates/index.php:11 -msgid "From url" -msgstr "URL" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "アップãƒãƒ¼ãƒ‰" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "アップãƒãƒ¼ãƒ‰ã‚’ã‚ャンセル" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "ã“ã“ã«ã¯ä½•ã‚‚ã‚ã‚Šã¾ã›ã‚“。何ã‹ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„。" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "共有" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "ダウンãƒãƒ¼ãƒ‰" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "ファイルサイズãŒå¤§ãã™ãŽã¾ã™" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "アップãƒãƒ¼ãƒ‰ã—よã†ã¨ã—ã¦ã„るファイルã¯ã€ã‚µãƒ¼ãƒã§è¦å®šã•ã‚ŒãŸæœ€å¤§ã‚µã‚¤ã‚ºã‚’超ãˆã¦ã„ã¾ã™ã€‚" -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "ファイルをスã‚ャンã—ã¦ã„ã¾ã™ã€ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„。" -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "スã‚ャンä¸" diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po index 8370c1d64a6..5a373fe3eb2 100644 --- a/l10n/ka_GE/files.po +++ b/l10n/ka_GE/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-23 02:02+0200\n" -"PO-Revision-Date: 2012-10-22 10:04+0000\n" -"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" +"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,15 +52,15 @@ msgstr "შეცდáƒáƒ›áƒ დისკზე ჩáƒáƒ¬áƒ”რისáƒáƒ¡" msgid "Files" msgstr "ფáƒáƒ˜áƒšáƒ”ბი" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "გáƒáƒ–იáƒáƒ ების მáƒáƒ®áƒ¡áƒœáƒ" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "წáƒáƒ¨áƒšáƒ" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "გáƒáƒ“áƒáƒ ქმევáƒ" @@ -100,116 +100,116 @@ msgstr "გáƒáƒ–იáƒáƒ ებრმáƒáƒ®áƒ¡áƒœáƒ˜áƒšáƒ˜ {files}" msgid "deleted {files}" msgstr "წáƒáƒ¨áƒšáƒ˜áƒšáƒ˜ {files}" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "ZIP-ფáƒáƒ˜áƒšáƒ˜áƒ¡ გენერირებáƒ, áƒáƒ›áƒáƒ¡ áƒáƒ˜áƒ დებრგáƒáƒ კვეული დრáƒ." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "თქვენი ფáƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ თვრვერმáƒáƒ®áƒ”რხდáƒ. ის áƒáƒ ის სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ე დრშეიცáƒáƒ•áƒ¡ 0 ბáƒáƒ˜áƒ¢áƒ¡" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "შეცდáƒáƒ›áƒ áƒáƒ¢áƒ•áƒ˜áƒ თვისáƒáƒ¡" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "მáƒáƒªáƒ“ის რეჟიმში" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "1 ფáƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ თვáƒ" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "{count} ფáƒáƒ˜áƒšáƒ˜ იტვირთებáƒ" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "áƒáƒ¢áƒ•áƒ˜áƒ თვრშეჩერებულ იქნáƒ." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "მიმდინáƒáƒ ეáƒáƒ‘ს ფáƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ თვáƒ. სხვრგვერდზე გáƒáƒ“áƒáƒ¡áƒ•áƒšáƒ გáƒáƒ›áƒáƒ˜áƒ¬áƒ•áƒ”ვს áƒáƒ¢áƒ•áƒ˜áƒ თვის შეჩერებáƒáƒ¡" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი სáƒáƒ®áƒ”ლი, '/' áƒáƒ დáƒáƒ˜áƒ¨áƒ•áƒ”ბáƒ." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "{count} ფáƒáƒ˜áƒšáƒ˜ სკáƒáƒœáƒ˜áƒ ებულიáƒ" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "შეცდáƒáƒ›áƒ სკáƒáƒœáƒ˜áƒ ებისáƒáƒ¡" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "სáƒáƒ®áƒ”ლი" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "ზáƒáƒ›áƒ" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "შეცვლილიáƒ" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ე" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{count} სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ე" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 ფáƒáƒ˜áƒšáƒ˜" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{count} ფáƒáƒ˜áƒšáƒ˜" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "წáƒáƒ›áƒ˜áƒ¡ წინ" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "1 წუთის წინ" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "{minutes} წუთის წინ" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "დღეს" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "გუშინ" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "{days} დღის წინ" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "გáƒáƒ¡áƒ£áƒš თვეში" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "თვის წინ" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "გáƒáƒ¡áƒ£áƒš წელს" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "წლის წინ" @@ -241,7 +241,7 @@ msgstr "0 is unlimited" msgid "Maximum input size for ZIP files" msgstr "ZIP ფáƒáƒ˜áƒšáƒ”ბის მáƒáƒ¥áƒ¡áƒ˜áƒ›áƒ£áƒ› დáƒáƒ¡áƒáƒ¨áƒ•áƒ”ბი ზáƒáƒ›áƒ" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "შენáƒáƒ®áƒ•áƒ" @@ -258,43 +258,43 @@ msgid "Folder" msgstr "სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ე" #: templates/index.php:11 -msgid "From url" -msgstr "მისáƒáƒ›áƒáƒ თიდáƒáƒœ" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "áƒáƒ¢áƒ•áƒ˜áƒ თვáƒ" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "áƒáƒ¢áƒ•áƒ˜áƒ თვის გáƒáƒ£áƒ¥áƒ›áƒ”ბáƒ" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "áƒáƒ¥ áƒáƒ áƒáƒ¤áƒ”რი áƒáƒ áƒáƒ ის. áƒáƒ¢áƒ•áƒ˜áƒ თე რáƒáƒ›áƒ”!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "გáƒáƒ–იáƒáƒ ებáƒ" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "ჩáƒáƒ›áƒáƒ¢áƒ•áƒ˜áƒ თვáƒ" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "áƒáƒ¡áƒáƒ¢áƒ•áƒ˜áƒ თი ფáƒáƒ˜áƒšáƒ˜ ძáƒáƒšáƒ˜áƒáƒœ დიდიáƒ" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "ფáƒáƒ˜áƒšáƒ˜áƒ¡ ზáƒáƒ›áƒ რáƒáƒ›áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ თვáƒáƒ¡áƒáƒª თქვენ áƒáƒžáƒ˜áƒ ებთ, áƒáƒáƒáƒ ბებს სერვერზე დáƒáƒ¨áƒ•áƒ”ბულ მáƒáƒ¥áƒ¡áƒ˜áƒ›áƒ£áƒ›áƒ¡." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "მიმდინáƒáƒ ეáƒáƒ‘ს ფáƒáƒ˜áƒšáƒ”ბის სკáƒáƒœáƒ˜áƒ ებáƒ, გთხáƒáƒ•áƒ— დáƒáƒ”ლáƒáƒ“áƒáƒ—." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "მიმდინáƒáƒ ე სკáƒáƒœáƒ˜áƒ ებáƒ" diff --git a/l10n/ko/files.po b/l10n/ko/files.po index 377c94cd6a4..8777987b8ff 100644 --- a/l10n/ko/files.po +++ b/l10n/ko/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" @@ -53,15 +53,15 @@ msgstr "디스í¬ì— 쓰지 못했습니다" msgid "Files" msgstr "파ì¼" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "ì‚ì œ" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "" @@ -101,116 +101,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "ZIPíŒŒì¼ ìƒì„±ì— ì‹œê°„ì´ ê±¸ë¦´ 수 있습니다." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "ì´ íŒŒì¼ì€ ë””ë ‰í† ë¦¬ì´ê±°ë‚˜ 0 ë°”ì´íŠ¸ì´ê¸° ë•Œë¬¸ì— ì—…ë¡œë“œ í• ìˆ˜ 없습니다." -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "업로드 ì—러" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "보류 중" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "업로드 취소." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "ìž˜ëª»ëœ ì´ë¦„, '/' ì€ í—ˆìš©ì´ ë˜ì§€ 않습니다." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "ì´ë¦„" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "í¬ê¸°" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "ìˆ˜ì •ë¨" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "" @@ -242,9 +242,9 @@ msgstr "0ì€ ë¬´ì œí•œ 입니다" msgid "Maximum input size for ZIP files" msgstr "ZIP 파ì¼ì— 대한 최대 ìž…ë ¥ í¬ê¸°" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "ì €ìž¥" #: templates/index.php:7 msgid "New" @@ -259,43 +259,43 @@ msgid "Folder" msgstr "í´ë”" #: templates/index.php:11 -msgid "From url" -msgstr "URL ì—ì„œ" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "업로드" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "업로드 취소" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "ë‚´ìš©ì´ ì—†ìŠµë‹ˆë‹¤. ì—…ë¡œë“œí• ìˆ˜ 있습니다!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "ê³µìœ " -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "다운로드" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "업로드 용량 초과" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "ì´ íŒŒì¼ì´ 서버ì—ì„œ 허용하는 최대 업로드 가능 용량보다 í½ë‹ˆë‹¤." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "파ì¼ì„ 검색중입니다, ê¸°ë‹¤ë ¤ 주ì‹ì‹œì˜¤." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "커런트 스ìºë‹" diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po index 2da200259e2..5d550551e7f 100644 --- a/l10n/ku_IQ/files.po +++ b/l10n/ku_IQ/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" @@ -51,15 +51,15 @@ msgstr "" msgid "Files" msgstr "" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "" @@ -99,116 +99,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "" -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" -msgstr "" +msgstr "ناو" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "" @@ -240,9 +240,9 @@ msgstr "" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "پاشکه‌وتکردن" #: templates/index.php:7 msgid "New" @@ -254,46 +254,46 @@ msgstr "" #: templates/index.php:10 msgid "Folder" -msgstr "" +msgstr "بوخچه" #: templates/index.php:11 -msgid "From url" +msgid "From link" msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" -msgstr "" +msgstr "بارکردن" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" -msgstr "" +msgstr "داگرتن" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "" diff --git a/l10n/lb/files.po b/l10n/lb/files.po index b6ebffcfb4f..cd6a9459f5b 100644 --- a/l10n/lb/files.po +++ b/l10n/lb/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" @@ -52,15 +52,15 @@ msgstr "Konnt net op den Disk schreiwen" msgid "Files" msgstr "Dateien" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Läschen" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "" @@ -100,116 +100,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "Et gëtt eng ZIP-File generéiert, dëst ka bëssen daueren." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass." -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Fehler beim eroplueden" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Upload ofgebrach." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Ongültege Numm, '/' net erlaabt." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Numm" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Gréisst" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Geännert" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "" @@ -241,9 +241,9 @@ msgstr "0 ass onlimitéiert" msgid "Maximum input size for ZIP files" msgstr "Maximal Gréisst fir ZIP Fichieren" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Späicheren" #: templates/index.php:7 msgid "New" @@ -258,43 +258,43 @@ msgid "Folder" msgstr "Dossier" #: templates/index.php:11 -msgid "From url" -msgstr "From URL" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Eroplueden" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Upload ofbriechen" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Hei ass näischt. Lued eppes rop!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Share" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Eroflueden" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Upload ze grouss" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Fichieren gi gescannt, war weg." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Momentane Scan" diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po index 005211a1a5b..f466d59c9e7 100644 --- a/l10n/lt_LT/files.po +++ b/l10n/lt_LT/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-10-23 02:02+0200\n" -"PO-Revision-Date: 2012-10-22 20:49+0000\n" -"Last-Translator: andrejuseu <andrejuszl@gmail.com>\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" +"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -54,15 +54,15 @@ msgstr "Nepavyko įraÅ¡yti į diskÄ…" msgid "Files" msgstr "Failai" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Nebesidalinti" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "IÅ¡trinti" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Pervadinti" @@ -102,116 +102,116 @@ msgstr "nebesidalinti {files}" msgid "deleted {files}" msgstr "iÅ¡trinti {files}" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "kuriamas ZIP archyvas, tai gali užtrukti Å¡iek tiek laiko." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Neįmanoma įkelti failo - jo dydis gali bÅ«ti 0 bitų arba tai katalogas" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Ä®kÄ—limo klaida" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Laukiantis" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "įkeliamas 1 failas" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "{count} įkeliami failai" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Ä®kÄ—limas atÅ¡auktas." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Failo įkÄ—limas pradÄ—tas. Jei paliksite šį puslapį, įkÄ—limas nutrÅ«ks." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Pavadinime negali bÅ«ti naudojamas ženklas \"/\"." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "{count} praskanuoti failai" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "klaida skanuojant" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Pavadinimas" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Dydis" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Pakeista" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 aplankalas" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{count} aplankalai" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 failas" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{count} failai" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "prieÅ¡ sekundÄ™" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "PrieÅ¡ 1 minutÄ™" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "PrieÅ¡ {count} minutes" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "Å¡iandien" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "vakar" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "PrieÅ¡ {days} dienas" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "praeitÄ… mÄ—nesį" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "prieÅ¡ mÄ—nesį" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "praeitais metais" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "prieÅ¡ metus" @@ -243,7 +243,7 @@ msgstr "0 yra neribotas" msgid "Maximum input size for ZIP files" msgstr "Maksimalus ZIP archyvo failo dydis" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "IÅ¡saugoti" @@ -260,43 +260,43 @@ msgid "Folder" msgstr "Katalogas" #: templates/index.php:11 -msgid "From url" -msgstr "IÅ¡ adreso" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Ä®kelti" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "AtÅ¡aukti siuntimÄ…" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "ÄŒia tuÅ¡Äia. Ä®kelkite kÄ… nors!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Dalintis" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Atsisiųsti" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Ä®kÄ—limui failas per didelis" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Bandomų įkelti failų dydis virÅ¡ija maksimalų leidžiamÄ… Å¡iame serveryje" -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Skenuojami failai, praÅ¡ome palaukti." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Å iuo metu skenuojama" diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po index 6bd5438d746..e1cfb8f0970 100644 --- a/l10n/lt_LT/files_external.po +++ b/l10n/lt_LT/files_external.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-10-23 02:02+0200\n" -"PO-Revision-Date: 2012-10-22 21:05+0000\n" -"Last-Translator: andrejuseu <andrejuszl@gmail.com>\n" +"POT-Creation-Date: 2012-11-01 00:01+0100\n" +"PO-Revision-Date: 2012-10-31 14:42+0000\n" +"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +25,7 @@ msgstr "PriÄ—jimas suteiktas" #: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86 msgid "Error configuring Dropbox storage" -msgstr "Klaida nustatinÄ—jantDropbox talpyklÄ…" +msgstr "Klaida nustatinÄ—jant Dropbox talpyklÄ…" #: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40 msgid "Grant access" diff --git a/l10n/lv/files.po b/l10n/lv/files.po index 718cb9cfa33..9dc008526b6 100644 --- a/l10n/lv/files.po +++ b/l10n/lv/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" @@ -52,15 +52,15 @@ msgstr "Nav iespÄ“jams saglabÄt" msgid "Files" msgstr "Faili" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" -msgstr "" +msgstr "PÄrtraukt lÄ«dzdalÄ«Å¡anu" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "IzdzÄ“st" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "" @@ -100,116 +100,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "lai uzÄ£enerÄ“tu ZIP failu, kÄds brÄ«dis ir jÄpagaida" -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Nav iespÄ“jams augÅ¡uplÄdÄ“t jÅ«su failu, jo tÄds jau eksistÄ“ vai arÄ« failam nav izmÄ“ra (0 baiti)" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "AugÅ¡uplÄdÄ“Å¡anas laikÄ radÄs kļūda" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Gaida savu kÄrtu" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "AugÅ¡uplÄde ir atcelta" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Å is simbols '/', nav atļauts." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Nosaukums" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "IzmÄ“rs" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "IzmainÄ«ts" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "" @@ -241,7 +241,7 @@ msgstr "0 ir neierobežots" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "" @@ -258,43 +258,43 @@ msgid "Folder" msgstr "Mape" #: templates/index.php:11 -msgid "From url" -msgstr "No URL saites" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "AugÅ¡uplÄdet" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Atcelt augÅ¡uplÄdi" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Te vÄ“l nekas nav. RÄ«kojies, sÄc augÅ¡uplÄdÄ“t" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "LÄ«dzdalÄ«t" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "LejuplÄdÄ“t" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Fails ir par lielu lai to augÅ¡uplÄdetu" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Faili Å¡obrÄ«d tiek caurskatÄ«ti, nedaudz jÄpagaida." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Å obrÄ«d tiek pÄrbaudÄ«ti" diff --git a/l10n/mk/files.po b/l10n/mk/files.po index b5cf88896ad..1351f615bc6 100644 --- a/l10n/mk/files.po +++ b/l10n/mk/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" @@ -54,15 +54,15 @@ msgstr "ÐеуÑпеав да запишам на диÑк" msgid "Files" msgstr "Датотеки" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Избриши" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "" @@ -102,116 +102,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "Се генерира ZIP фајлот, ќе треба извеÑно време." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Ðе може да Ñе преземе вашата датотека бидејќи фолдерот во кој Ñе наоѓа фајлот има големина од 0 бајти" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Грешка при преземање" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Чека" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Преземањето е прекинато." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "неиÑправно име, '/' не е дозволено." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Име" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Големина" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Променето" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "" @@ -243,9 +243,9 @@ msgstr "0 е неограничено" msgid "Maximum input size for ZIP files" msgstr "МакÑимална големина за Ð²Ð½ÐµÑ Ð½Ð° ZIP датотеки" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Сними" #: templates/index.php:7 msgid "New" @@ -260,43 +260,43 @@ msgid "Folder" msgstr "Папка" #: templates/index.php:11 -msgid "From url" -msgstr "Од адреÑа" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Подигни" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Откажи прикачување" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Тука нема ништо. Снимете нешто!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Сподели" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Преземи" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Датотеката е премногу голема" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Датотеките кои Ñе обидувате да ги подигнете ја надминуваат макÑималната големина за подигнување датотеки на овој Ñервер." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Се Ñкенираат датотеки, ве молам почекајте." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Моментално Ñкенирам" diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po index 28eaa95c89e..f6c25f2fdf1 100644 --- a/l10n/ms_MY/files.po +++ b/l10n/ms_MY/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" @@ -55,15 +55,15 @@ msgstr "Gagal untuk disimpan" msgid "Files" msgstr "fail" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Padam" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "" @@ -103,116 +103,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "sedang menghasilkan fail ZIP, mungkin mengambil sedikit masa." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Muat naik ralat" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Dalam proses" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Muatnaik dibatalkan." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "penggunaa nama tidak sah, '/' tidak dibenarkan." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Nama " -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Saiz" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Dimodifikasi" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "" @@ -244,9 +244,9 @@ msgstr "0 adalah tanpa had" msgid "Maximum input size for ZIP files" msgstr "Saiz maksimum input untuk fail ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Simpan" #: templates/index.php:7 msgid "New" @@ -261,43 +261,43 @@ msgid "Folder" msgstr "Folder" #: templates/index.php:11 -msgid "From url" -msgstr "Dari url" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Muat naik" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Batal muat naik" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Tiada apa-apa di sini. Muat naik sesuatu!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Kongsi" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Muat turun" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Muat naik terlalu besar" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server" -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Fail sedang diimbas, harap bersabar." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Imbasan semasa" diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po index ebb0691f52c..e1f3763f665 100644 --- a/l10n/nb_NO/core.po +++ b/l10n/nb_NO/core.po @@ -6,15 +6,16 @@ # <ajarmund@gmail.com>, 2011, 2012. # Christer Eriksson <post@hc3web.com>, 2012. # Daniel <i18n@daniel.priv.no>, 2012. +# <hdalgrav@gmail.com>, 2012. # <itssmail@yahoo.no>, 2012. # <runesudden@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-27 22:12+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-10-31 00:01+0100\n" +"PO-Revision-Date: 2012-10-30 13:00+0000\n" +"Last-Translator: hdalgrav <hdalgrav@gmail.com>\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -40,7 +41,7 @@ msgstr "Innstillinger" #: js/oc-dialogs.js:123 msgid "Choose" -msgstr "" +msgstr "Velg" #: js/oc-dialogs.js:143 js/oc-dialogs.js:163 msgid "Cancel" @@ -69,7 +70,7 @@ msgstr "Feil" #: js/share.js:124 msgid "Error while sharing" -msgstr "" +msgstr "Feil under deling" #: js/share.js:135 msgid "Error while unsharing" @@ -89,15 +90,15 @@ msgstr "" #: js/share.js:158 msgid "Share with" -msgstr "" +msgstr "Del med" #: js/share.js:163 msgid "Share with link" -msgstr "" +msgstr "Del med link" #: js/share.js:164 msgid "Password protect" -msgstr "" +msgstr "Passordbeskyttet" #: js/share.js:168 templates/installation.php:42 templates/login.php:24 #: templates/verify.php:13 @@ -106,19 +107,19 @@ msgstr "Passord" #: js/share.js:173 msgid "Set expiration date" -msgstr "" +msgstr "Set utløpsdato" #: js/share.js:174 msgid "Expiration date" -msgstr "" +msgstr "Utløpsdato" #: js/share.js:206 msgid "Share via email:" -msgstr "" +msgstr "Del pÃ¥ epost" #: js/share.js:208 msgid "No people found" -msgstr "" +msgstr "Ingen personer funnet" #: js/share.js:235 msgid "Resharing is not allowed" @@ -134,11 +135,11 @@ msgstr "Avslutt deling" #: js/share.js:304 msgid "can edit" -msgstr "" +msgstr "kan endre" #: js/share.js:306 msgid "access control" -msgstr "" +msgstr "tilgangskontroll" #: js/share.js:309 msgid "create" @@ -146,19 +147,19 @@ msgstr "opprett" #: js/share.js:312 msgid "update" -msgstr "" +msgstr "oppdater" #: js/share.js:315 msgid "delete" -msgstr "" +msgstr "slett" #: js/share.js:318 msgid "share" -msgstr "" +msgstr "del" #: js/share.js:343 js/share.js:512 js/share.js:514 msgid "Password protected" -msgstr "" +msgstr "Passordbeskyttet" #: js/share.js:525 msgid "Error unsetting expiration date" @@ -166,7 +167,7 @@ msgstr "" #: js/share.js:537 msgid "Error setting expiration date" -msgstr "" +msgstr "Kan ikke sette utløpsdato" #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -405,17 +406,17 @@ msgstr "Logg ut" #: templates/login.php:8 msgid "Automatic logon rejected!" -msgstr "" +msgstr "Automatisk pÃ¥logging avvist!" #: templates/login.php:9 msgid "" "If you did not change your password recently, your account may be " "compromised!" -msgstr "" +msgstr "Hvis du ikke har endret passordet ditt nylig kan kontoen din være kompromitert" #: templates/login.php:10 msgid "Please change your password to secure your account again." -msgstr "" +msgstr "Vennligst skift passord for Ã¥ gjøre kontoen din sikker igjen." #: templates/login.php:15 msgid "Lost your password?" @@ -443,7 +444,7 @@ msgstr "neste" #: templates/verify.php:5 msgid "Security Warning!" -msgstr "" +msgstr "Sikkerhetsadvarsel!" #: templates/verify.php:6 msgid "" @@ -453,4 +454,4 @@ msgstr "" #: templates/verify.php:16 msgid "Verify" -msgstr "" +msgstr "Verifiser" diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po index 497cc838b7f..07c943e6050 100644 --- a/l10n/nb_NO/files.po +++ b/l10n/nb_NO/files.po @@ -7,6 +7,7 @@ # Arvid Nornes <arvid.nornes@gmail.com>, 2012. # Christer Eriksson <post@hc3web.com>, 2012. # Daniel <i18n@daniel.priv.no>, 2012. +# <hdalgrav@gmail.com>, 2012. # <olamaekle@gmail.com>, 2012. # <runesudden@gmail.com>, 2012. # <sindre@haverstad.com>, 2012. @@ -14,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" @@ -58,21 +59,21 @@ msgstr "Klarte ikke Ã¥ skrive til disk" msgid "Files" msgstr "Filer" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Avslutt deling" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Slett" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Omdøp" #: js/filelist.js:194 js/filelist.js:196 msgid "{new_name} already exists" -msgstr "" +msgstr "{new_name} finnes allerede" #: js/filelist.js:194 js/filelist.js:196 msgid "replace" @@ -88,7 +89,7 @@ msgstr "avbryt" #: js/filelist.js:243 msgid "replaced {new_name}" -msgstr "" +msgstr "erstatt {new_name}" #: js/filelist.js:243 js/filelist.js:245 js/filelist.js:277 js/filelist.js:279 msgid "undo" @@ -96,7 +97,7 @@ msgstr "angre" #: js/filelist.js:245 msgid "replaced {new_name} with {old_name}" -msgstr "" +msgstr "erstatt {new_name} med {old_name}" #: js/filelist.js:277 msgid "unshared {files}" @@ -104,118 +105,118 @@ msgstr "" #: js/filelist.js:279 msgid "deleted {files}" -msgstr "" +msgstr "slettet {files}" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "opprettet ZIP-fil, dette kan ta litt tid" -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Opplasting feilet" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Ventende" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "1 fil lastes opp" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" -msgstr "" +msgstr "{count} filer laster opp" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Opplasting avbrutt." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Filopplasting pÃ¥gÃ¥r. Forlater du siden nÃ¥ avbrytes opplastingen." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Ugyldig navn, '/' er ikke tillatt. " -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" -msgstr "" +msgstr "{count} filer lest inn" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "feil under skanning" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Navn" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Størrelse" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Endret" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" -msgstr "" +msgstr "1 mappe" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" -msgstr "" +msgstr "{count} mapper" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" -msgstr "" +msgstr "1 fil" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" -msgstr "" +msgstr "{count} filer" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "sekunder siden" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "1 minutt siden" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" -msgstr "" +msgstr "{minutes} minutter siden" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "i dag" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "i gÃ¥r" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" -msgstr "" +msgstr "{days} dager siden" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "forrige mÃ¥ned" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "mÃ¥neder siden" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "forrige Ã¥r" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "Ã¥r siden" @@ -247,7 +248,7 @@ msgstr "0 er ubegrenset" msgid "Maximum input size for ZIP files" msgstr "Maksimal størrelse pÃ¥ ZIP-filer" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Lagre" @@ -264,43 +265,43 @@ msgid "Folder" msgstr "Mappe" #: templates/index.php:11 -msgid "From url" -msgstr "Fra url" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Last opp" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Avbryt opplasting" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Ingenting her. Last opp noe!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Del" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Last ned" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Opplasting for stor" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Filene du prøver Ã¥ laste opp er for store for Ã¥ laste opp til denne serveren." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Skanner etter filer, vennligst vent." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "PÃ¥gÃ¥ende skanning" diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po index f449d2b5d8d..8f4798597a0 100644 --- a/l10n/nb_NO/files_sharing.po +++ b/l10n/nb_NO/files_sharing.po @@ -4,13 +4,14 @@ # # Translators: # Arvid Nornes <arvid.nornes@gmail.com>, 2012. +# <hdalgrav@gmail.com>, 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 <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-10-31 00:01+0100\n" +"PO-Revision-Date: 2012-10-30 12:47+0000\n" +"Last-Translator: hdalgrav <hdalgrav@gmail.com>\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,30 +21,30 @@ msgstr "" #: templates/authenticate.php:4 msgid "Password" -msgstr "" +msgstr "Passord" #: templates/authenticate.php:6 msgid "Submit" -msgstr "" +msgstr "Send inn" #: templates/public.php:9 #, php-format msgid "%s shared the folder %s with you" -msgstr "" +msgstr "%s delte mappen %s med deg" #: templates/public.php:11 #, php-format msgid "%s shared the file %s with you" -msgstr "" +msgstr "%s delte filen %s med deg" #: templates/public.php:14 templates/public.php:30 msgid "Download" -msgstr "" +msgstr "Last ned" #: templates/public.php:29 msgid "No preview available for" -msgstr "" +msgstr "ForhÃ¥ndsvisning ikke tilgjengelig for" -#: templates/public.php:37 +#: templates/public.php:35 msgid "web services under your control" -msgstr "" +msgstr "web tjenester du kontrollerer" diff --git a/l10n/nb_NO/files_versions.po b/l10n/nb_NO/files_versions.po index de2fd2c9766..bd8d0fed59e 100644 --- a/l10n/nb_NO/files_versions.po +++ b/l10n/nb_NO/files_versions.po @@ -4,13 +4,14 @@ # # Translators: # Arvid Nornes <arvid.nornes@gmail.com>, 2012. +# <hdalgrav@gmail.com>, 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 <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-10-31 00:01+0100\n" +"PO-Revision-Date: 2012-10-30 12:48+0000\n" +"Last-Translator: hdalgrav <hdalgrav@gmail.com>\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,20 +25,20 @@ msgstr "" #: js/versions.js:16 msgid "History" -msgstr "" +msgstr "Historie" #: templates/settings-personal.php:4 msgid "Versions" -msgstr "" +msgstr "Versjoner" #: templates/settings-personal.php:7 msgid "This will delete all existing backup versions of your files" -msgstr "" +msgstr "Dette vil slette alle tidligere versjoner av alle filene dine" #: templates/settings.php:3 msgid "Files Versioning" -msgstr "" +msgstr "Fil versjonering" #: templates/settings.php:4 msgid "Enable" -msgstr "" +msgstr "Aktiver" diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po index bd95451cb2f..dbaab446846 100644 --- a/l10n/nb_NO/lib.po +++ b/l10n/nb_NO/lib.po @@ -4,15 +4,16 @@ # # Translators: # Arvid Nornes <arvid.nornes@gmail.com>, 2012. +# <hdalgrav@gmail.com>, 2012. # <runesudden@gmail.com>, 2012. # <sindre@haverstad.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-25 02:07+0200\n" -"PO-Revision-Date: 2012-10-24 00:11+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-10-31 00:01+0100\n" +"PO-Revision-Date: 2012-10-30 13:11+0000\n" +"Last-Translator: hdalgrav <hdalgrav@gmail.com>\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -82,47 +83,47 @@ msgstr "Tekst" #: search/provider/file.php:29 msgid "Images" -msgstr "" +msgstr "Bilder" -#: template.php:87 +#: template.php:103 msgid "seconds ago" msgstr "sekunder siden" -#: template.php:88 +#: template.php:104 msgid "1 minute ago" msgstr "1 minuitt siden" -#: template.php:89 +#: template.php:105 #, php-format msgid "%d minutes ago" msgstr "%d minutter siden" -#: template.php:92 +#: template.php:108 msgid "today" msgstr "i dag" -#: template.php:93 +#: template.php:109 msgid "yesterday" msgstr "i gÃ¥r" -#: template.php:94 +#: template.php:110 #, php-format msgid "%d days ago" msgstr "%d dager siden" -#: template.php:95 +#: template.php:111 msgid "last month" msgstr "forrige mÃ¥ned" -#: template.php:96 +#: template.php:112 msgid "months ago" msgstr "mÃ¥neder siden" -#: template.php:97 +#: template.php:113 msgid "last year" msgstr "i fjor" -#: template.php:98 +#: template.php:114 msgid "years ago" msgstr "Ã¥r siden" diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po index 0089568671f..46e8bcca7e0 100644 --- a/l10n/nb_NO/settings.po +++ b/l10n/nb_NO/settings.po @@ -7,15 +7,16 @@ # Arvid Nornes <arvid.nornes@gmail.com>, 2012. # Christer Eriksson <post@hc3web.com>, 2012. # Daniel <i18n@daniel.priv.no>, 2012. +# <hdalgrav@gmail.com>, 2012. # <itssmail@yahoo.no>, 2012. # <runesudden@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-09 02:03+0200\n" -"PO-Revision-Date: 2012-10-09 00:04+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-10-31 00:01+0100\n" +"PO-Revision-Date: 2012-10-30 12:33+0000\n" +"Last-Translator: hdalgrav <hdalgrav@gmail.com>\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,70 +24,69 @@ msgstr "" "Language: nb_NO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/apps/ocs.php:23 +#: ajax/apps/ocs.php:20 msgid "Unable to load list from App Store" msgstr "Lasting av liste fra App Store feilet." -#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18 -#: ajax/togglegroups.php:15 -msgid "Authentication error" -msgstr "Autentikasjonsfeil" - -#: ajax/creategroup.php:19 +#: ajax/creategroup.php:10 msgid "Group already exists" -msgstr "" +msgstr "Gruppen finnes allerede" -#: ajax/creategroup.php:28 +#: ajax/creategroup.php:19 msgid "Unable to add group" -msgstr "" +msgstr "Kan ikke legge til gruppe" -#: ajax/enableapp.php:14 +#: ajax/enableapp.php:12 msgid "Could not enable app. " -msgstr "" +msgstr "Kan ikke aktivere app." -#: ajax/lostpassword.php:14 +#: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Epost lagret" -#: ajax/lostpassword.php:16 +#: ajax/lostpassword.php:14 msgid "Invalid email" msgstr "Ugyldig epost" -#: ajax/openid.php:16 +#: ajax/openid.php:13 msgid "OpenID Changed" msgstr "OpenID endret" -#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23 +#: ajax/openid.php:15 ajax/setlanguage.php:17 ajax/setlanguage.php:20 msgid "Invalid request" msgstr "Ugyldig forespørsel" -#: ajax/removegroup.php:16 +#: ajax/removegroup.php:13 msgid "Unable to delete group" -msgstr "" +msgstr "Kan ikke slette gruppe" + +#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:12 +msgid "Authentication error" +msgstr "Autentikasjonsfeil" -#: ajax/removeuser.php:22 +#: ajax/removeuser.php:24 msgid "Unable to delete user" -msgstr "" +msgstr "Kan ikke slette bruker" -#: ajax/setlanguage.php:18 +#: ajax/setlanguage.php:15 msgid "Language changed" msgstr "SprÃ¥k endret" -#: ajax/togglegroups.php:25 +#: ajax/togglegroups.php:22 #, php-format msgid "Unable to add user to group %s" -msgstr "" +msgstr "Kan ikke legge bruker til gruppen %s" -#: ajax/togglegroups.php:31 +#: ajax/togglegroups.php:28 #, php-format msgid "Unable to remove user from group %s" -msgstr "" +msgstr "Kan ikke slette bruker fra gruppen %s" -#: js/apps.js:28 js/apps.js:65 +#: js/apps.js:28 js/apps.js:67 msgid "Disable" msgstr "SlÃ¥ avBehandle " -#: js/apps.js:28 js/apps.js:54 +#: js/apps.js:28 js/apps.js:55 msgid "Enable" msgstr "SlÃ¥ pÃ¥" @@ -94,7 +94,7 @@ msgstr "SlÃ¥ pÃ¥" msgid "Saving..." msgstr "Lagrer..." -#: personal.php:47 personal.php:48 +#: personal.php:42 personal.php:43 msgid "__language_name__" msgstr "__language_name__" @@ -133,7 +133,7 @@ msgstr "" #: templates/admin.php:56 msgid "Sharing" -msgstr "" +msgstr "Deling" #: templates/admin.php:61 msgid "Enable Share API" @@ -145,11 +145,11 @@ msgstr "" #: templates/admin.php:67 msgid "Allow links" -msgstr "" +msgstr "Tillat lenker" #: templates/admin.php:68 msgid "Allow users to share items to the public with links" -msgstr "" +msgstr "Tillat brukere Ã¥ dele filer med lenker" #: templates/admin.php:73 msgid "Allow resharing" @@ -157,15 +157,15 @@ msgstr "" #: templates/admin.php:74 msgid "Allow users to share items shared with them again" -msgstr "" +msgstr "Tillat brukere Ã¥ dele filer som allerede har blitt delt med dem" #: templates/admin.php:79 msgid "Allow users to share with anyone" -msgstr "" +msgstr "Tillat brukere Ã¥ dele med alle" #: templates/admin.php:81 msgid "Allow users to only share with users in their groups" -msgstr "" +msgstr "Tillat kun deling med andre brukere i samme gruppe" #: templates/admin.php:88 msgid "Log" @@ -191,7 +191,7 @@ msgstr "Legg til din App" #: templates/apps.php:11 msgid "More Apps" -msgstr "" +msgstr "Flere Apps" #: templates/apps.php:27 msgid "Select an App" @@ -232,7 +232,7 @@ msgstr "Svar" #: templates/personal.php:8 #, php-format msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>" -msgstr "" +msgstr "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" @@ -244,7 +244,7 @@ msgstr "Last ned" #: templates/personal.php:19 msgid "Your password was changed" -msgstr "" +msgstr "Passord har blitt endret" #: templates/personal.php:20 msgid "Unable to change your password" diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po index 2208bdc9acd..1ebfbe8b544 100644 --- a/l10n/nb_NO/user_ldap.po +++ b/l10n/nb_NO/user_ldap.po @@ -3,19 +3,20 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <hdalgrav@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-10-31 00:01+0100\n" +"PO-Revision-Date: 2012-10-30 13:08+0000\n" +"Last-Translator: hdalgrav <hdalgrav@gmail.com>\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: nb_NO\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 msgid "Host" @@ -47,7 +48,7 @@ msgstr "" #: templates/settings.php:11 msgid "Password" -msgstr "" +msgstr "Passord" #: templates/settings.php:11 msgid "For anonymous access, leave DN and Password empty." @@ -83,7 +84,7 @@ msgstr "" #: templates/settings.php:14 msgid "Group Filter" -msgstr "" +msgstr "Gruppefilter" #: templates/settings.php:14 msgid "Defines the filter to apply, when retrieving groups." @@ -95,7 +96,7 @@ msgstr "" #: templates/settings.php:17 msgid "Port" -msgstr "" +msgstr "Port" #: templates/settings.php:18 msgid "Base User Tree" @@ -111,11 +112,11 @@ msgstr "" #: templates/settings.php:21 msgid "Use TLS" -msgstr "" +msgstr "Bruk TLS" #: templates/settings.php:21 msgid "Do not use it for SSL connections, it will fail." -msgstr "" +msgstr "Ikke bruk for SSL tilkoblinger, dette vil ikke fungere." #: templates/settings.php:22 msgid "Case insensitve LDAP server (Windows)" @@ -133,7 +134,7 @@ msgstr "" #: templates/settings.php:23 msgid "Not recommended, use for testing only." -msgstr "" +msgstr "Ikke anbefalt, bruk kun for testing" #: templates/settings.php:24 msgid "User Display Name Field" @@ -153,11 +154,11 @@ msgstr "" #: templates/settings.php:27 msgid "in bytes" -msgstr "" +msgstr "i bytes" #: templates/settings.php:29 msgid "in seconds. A change empties the cache." -msgstr "" +msgstr "i sekunder. En endring tømmer bufferen." #: templates/settings.php:30 msgid "" @@ -167,4 +168,4 @@ msgstr "" #: templates/settings.php:32 msgid "Help" -msgstr "" +msgstr "Hjelp" diff --git a/l10n/nl/files.po b/l10n/nl/files.po index 7550efceceb..a8f011493e4 100644 --- a/l10n/nl/files.po +++ b/l10n/nl/files.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-24 02:02+0200\n" -"PO-Revision-Date: 2012-10-23 18:05+0000\n" -"Last-Translator: Richard Bos <radoeka@gmail.com>\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" +"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -60,15 +60,15 @@ msgstr "Schrijven naar schijf mislukt" msgid "Files" msgstr "Bestanden" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Stop delen" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Verwijder" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Hernoem" @@ -108,116 +108,116 @@ msgstr "delen gestopt {files}" msgid "deleted {files}" msgstr "verwijderde {files}" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "aanmaken ZIP-file, dit kan enige tijd duren." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Upload Fout" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Wachten" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "1 bestand wordt ge-upload" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "{count} bestanden aan het uploaden" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Uploaden geannuleerd." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Bestands upload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Ongeldige naam, '/' is niet toegestaan." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "{count} bestanden gescanned" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "Fout tijdens het scannen" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Naam" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Bestandsgrootte" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Laatst aangepast" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 map" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{count} mappen" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 bestand" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{count} bestanden" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "seconden geleden" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "1 minuut geleden" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "{minutes} minuten geleden" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "vandaag" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "gisteren" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "{days} dagen geleden" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "vorige maand" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "maanden geleden" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "vorig jaar" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "jaar geleden" @@ -249,7 +249,7 @@ msgstr "0 is ongelimiteerd" msgid "Maximum input size for ZIP files" msgstr "Maximale grootte voor ZIP bestanden" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Opslaan" @@ -266,43 +266,43 @@ msgid "Folder" msgstr "Map" #: templates/index.php:11 -msgid "From url" -msgstr "Van hyperlink" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Upload" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Upload afbreken" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Er bevindt zich hier niets. Upload een bestand!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Delen" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Download" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Bestanden te groot" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane bestandsgrootte voor deze server." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Bestanden worden gescand, even wachten." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Er wordt gescand" diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po index 20439743015..5d0cb29c915 100644 --- a/l10n/nn_NO/files.po +++ b/l10n/nn_NO/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -53,15 +53,15 @@ msgstr "" msgid "Files" msgstr "Filer" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Slett" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "" @@ -101,116 +101,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "" -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Namn" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Storleik" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Endra" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "" @@ -242,9 +242,9 @@ msgstr "" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Lagre" #: templates/index.php:7 msgid "New" @@ -259,43 +259,43 @@ msgid "Folder" msgstr "Mappe" #: templates/index.php:11 -msgid "From url" +msgid "From link" msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Last opp" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Ingenting her. Last noko opp!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Last ned" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "For stor opplasting" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Filene du prøver Ã¥ laste opp er større enn maksgrensa til denne tenaren." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "" diff --git a/l10n/oc/files.po b/l10n/oc/files.po index a2fd891e0ba..9011a3c8edd 100644 --- a/l10n/oc/files.po +++ b/l10n/oc/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" @@ -52,15 +52,15 @@ msgstr "L'escriptura sul disc a fracassat" msgid "Files" msgstr "Fichièrs" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Non parteja" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Escafa" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Torna nomenar" @@ -100,116 +100,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "Fichièr ZIP a se far, aquò pòt trigar un briu." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Impossible d'amontcargar lo teu fichièr qu'es un repertòri o que ten pas que 0 octet." -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Error d'amontcargar" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Al esperar" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "1 fichièr al amontcargar" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Amontcargar anullat." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. " -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Nom invalid, '/' es pas permis." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "error pendant l'exploracion" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Nom" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Talha" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Modificat" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "secondas" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "1 minuta a" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "uèi" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "ièr" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "mes passat" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "meses" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "an passat" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "ans" @@ -241,7 +241,7 @@ msgstr "0 es pas limitat" msgid "Maximum input size for ZIP files" msgstr "Talha maximum de dintrada per fichièrs ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Enregistra" @@ -258,43 +258,43 @@ msgid "Folder" msgstr "Dorsièr" #: templates/index.php:11 -msgid "From url" -msgstr "Dempuèi l'URL" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Amontcarga" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr " Anulla l'amontcargar" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Pas res dedins. Amontcarga qualquaren" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Parteja" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Avalcarga" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Amontcargament tròp gròs" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Los fiichièrs son a èsser explorats, " -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Exploracion en cors" diff --git a/l10n/pl/core.po b/l10n/pl/core.po index fb596aad01b..42c9cf379bf 100644 --- a/l10n/pl/core.po +++ b/l10n/pl/core.po @@ -6,18 +6,20 @@ # Cyryl Sochacki <>, 2012. # Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012. # Kamil DomaÅ„ski <kdomanski@kdemail.net>, 2011. +# <koalamis0@gmail.com>, 2012. # Marcin MaÅ‚ecki <gerber@tkdami.net>, 2011, 2012. # Marcin MaÅ‚ecki <mosslar@gmail.com>, 2011. # <mosslar@gmail.com>, 2011. # <mplichta@gmail.com>, 2012. # Piotr Sokół <psokol@jabster.pl>, 2012. +# <rightxhere1@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-27 22:12+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-11-01 00:01+0100\n" +"PO-Revision-Date: 2012-10-31 11:14+0000\n" +"Last-Translator: emilia.krawczyk <rightxhere1@gmail.com>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,23 +43,23 @@ msgstr "Ta kategoria już istnieje" msgid "Settings" msgstr "Ustawienia" -#: js/oc-dialogs.js:123 +#: js/oc-dialogs.js:126 msgid "Choose" msgstr "Wybierz" -#: js/oc-dialogs.js:143 js/oc-dialogs.js:163 +#: js/oc-dialogs.js:146 js/oc-dialogs.js:166 msgid "Cancel" msgstr "Anuluj" -#: js/oc-dialogs.js:159 +#: js/oc-dialogs.js:162 msgid "No" msgstr "Nie" -#: js/oc-dialogs.js:160 +#: js/oc-dialogs.js:163 msgid "Yes" msgstr "Tak" -#: js/oc-dialogs.js:177 +#: js/oc-dialogs.js:180 msgid "Ok" msgstr "Ok" @@ -185,11 +187,11 @@ msgstr "OdnoÅ›nik sÅ‚użący do resetowania hasÅ‚a zostanie wysÅ‚any na adres e- #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "WyÅ›lij zresetowany email." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "Próba nieudana!" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 #: templates/login.php:20 diff --git a/l10n/pl/files.po b/l10n/pl/files.po index e03f6a4e2ef..bc007cff9c5 100644 --- a/l10n/pl/files.po +++ b/l10n/pl/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-10-20 02:02+0200\n" -"PO-Revision-Date: 2012-10-19 09:08+0000\n" -"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" +"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,15 +57,15 @@ msgstr "BÅ‚Ä…d zapisu na dysk" msgid "Files" msgstr "Pliki" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Nie udostÄ™pniaj" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Usuwa element" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "ZmieÅ„ nazwÄ™" @@ -105,116 +105,116 @@ msgstr "UdostÄ™pniane wstrzymane {files}" msgid "deleted {files}" msgstr "usuniÄ™to {files}" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "Generowanie pliku ZIP, może potrwać pewien czas." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Nie można wczytać pliku jeÅ›li jest katalogiem lub ma 0 bajtów" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "BÅ‚Ä…d wczytywania" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "OczekujÄ…ce" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "1 plik wczytany" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "{count} przesyÅ‚anie plików" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Wczytywanie anulowane." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "WysyÅ‚anie pliku jest w toku. Teraz opuszczajÄ…c stronÄ™ wysyÅ‚anie zostanie anulowane." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "NieprawidÅ‚owa nazwa '/' jest niedozwolone." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "{count} pliki skanowane" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "WystÄ…piÅ‚ bÅ‚Ä…d podczas skanowania" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Nazwa" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Rozmiar" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Czas modyfikacji" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 folder" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{count} foldery" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 plik" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{count} pliki" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "sekund temu" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "1 minute temu" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "{minutes} minut temu" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "dziÅ›" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "wczoraj" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "{days} dni temu" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "ostani miesiÄ…c" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "miesiÄ™cy temu" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "ostatni rok" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "lat temu" @@ -246,7 +246,7 @@ msgstr "0 jest nielimitowane" msgid "Maximum input size for ZIP files" msgstr "Maksymalna wielkość pliku wejÅ›ciowego ZIP " -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Zapisz" @@ -263,43 +263,43 @@ msgid "Folder" msgstr "Katalog" #: templates/index.php:11 -msgid "From url" -msgstr "Z adresu" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "PrzeÅ›lij" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "PrzestaÅ„ wysyÅ‚ać" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Brak zawartoÅ›ci. ProszÄ™ wysÅ‚ać pliki!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Współdziel" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Pobiera element" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "WysyÅ‚any plik ma za duży rozmiar" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Pliki które próbujesz przesÅ‚ać, przekraczajÄ… maksymalnÄ…, dopuszczalnÄ… wielkość." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Skanowanie plików, proszÄ™ czekać." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Aktualnie skanowane" diff --git a/l10n/pl_PL/files.po b/l10n/pl_PL/files.po index 431ef2cb6b8..eb216aaa96e 100644 --- a/l10n/pl_PL/files.po +++ b/l10n/pl_PL/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n" "MIME-Version: 1.0\n" @@ -51,15 +51,15 @@ msgstr "" msgid "Files" msgstr "" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "" @@ -99,116 +99,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "" -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "" @@ -240,9 +240,9 @@ msgstr "" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Zapisz" #: templates/index.php:7 msgid "New" @@ -257,43 +257,43 @@ msgid "Folder" msgstr "" #: templates/index.php:11 -msgid "From url" +msgid "From link" msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "" diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po index b6c48475719..02e4283a1be 100644 --- a/l10n/pt_BR/core.po +++ b/l10n/pt_BR/core.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <dudanogueira@gmail.com>, 2012. # <duda.nogueira@metasys.com.br>, 2011. # Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012. # <henrique@meira.net>, 2012. @@ -14,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-27 22:12+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" +"PO-Revision-Date: 2012-11-03 14:28+0000\n" +"Last-Translator: dudanogueira <dudanogueira@gmail.com>\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" @@ -40,23 +41,23 @@ msgstr "Essa categoria já existe" msgid "Settings" msgstr "Configurações" -#: js/oc-dialogs.js:123 +#: js/oc-dialogs.js:126 msgid "Choose" msgstr "Escolha" -#: js/oc-dialogs.js:143 js/oc-dialogs.js:163 +#: js/oc-dialogs.js:146 js/oc-dialogs.js:166 msgid "Cancel" msgstr "Cancelar" -#: js/oc-dialogs.js:159 +#: js/oc-dialogs.js:162 msgid "No" msgstr "Não" -#: js/oc-dialogs.js:160 +#: js/oc-dialogs.js:163 msgid "Yes" msgstr "Sim" -#: js/oc-dialogs.js:177 +#: js/oc-dialogs.js:180 msgid "Ok" msgstr "Ok" @@ -83,11 +84,11 @@ msgstr "Erro ao mudar permissões" #: js/share.js:151 msgid "Shared with you and the group {group} by {owner}" -msgstr "" +msgstr "Compartilhado com você e com o grupo {group} por {owner}" #: js/share.js:153 msgid "Shared with you by {owner}" -msgstr "" +msgstr "Compartilhado com você por {owner}" #: js/share.js:158 msgid "Share with" @@ -128,7 +129,7 @@ msgstr "Não é permitido re-compartilhar" #: js/share.js:271 msgid "Shared in {item} with {user}" -msgstr "" +msgstr "Compartilhado em {item} com {user}" #: js/share.js:292 msgid "Unshare" @@ -184,11 +185,11 @@ msgstr "Você receberá um link para redefinir sua senha via e-mail." #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "Email de redefinição de senha enviado." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "A requisição falhou!" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 #: templates/login.php:20 @@ -407,13 +408,13 @@ msgstr "Sair" #: templates/login.php:8 msgid "Automatic logon rejected!" -msgstr "" +msgstr "Entrada Automática no Sistema Rejeitada!" #: templates/login.php:9 msgid "" "If you did not change your password recently, your account may be " "compromised!" -msgstr "" +msgstr "Se você não mudou a sua senha recentemente, a sua conta pode estar comprometida!" #: templates/login.php:10 msgid "Please change your password to secure your account again." @@ -451,8 +452,8 @@ msgstr "Aviso de Segurança!" msgid "" "Please verify your password. <br/>For security reasons you may be " "occasionally asked to enter your password again." -msgstr "" +msgstr "Por favor, verifique a sua senha.<br />Por motivos de segurança, você deverá ser solicitado a muda-la ocasionalmente." #: templates/verify.php:16 msgid "Verify" -msgstr "" +msgstr "Verificar" diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po index 62e97861493..25a43267825 100644 --- a/l10n/pt_BR/files.po +++ b/l10n/pt_BR/files.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <dudanogueira@gmail.com>, 2012. # Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012. # <philippi.sedir@gmail.com>, 2012. # <targinosilveira@gmail.com>, 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-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" +"PO-Revision-Date: 2012-11-03 14:24+0000\n" +"Last-Translator: dudanogueira <dudanogueira@gmail.com>\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" @@ -57,21 +58,21 @@ msgstr "Falha ao escrever no disco" msgid "Files" msgstr "Arquivos" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Descompartilhar" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Excluir" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Renomear" #: js/filelist.js:194 js/filelist.js:196 msgid "{new_name} already exists" -msgstr "" +msgstr "{new_name} já existe" #: js/filelist.js:194 js/filelist.js:196 msgid "replace" @@ -87,7 +88,7 @@ msgstr "cancelar" #: js/filelist.js:243 msgid "replaced {new_name}" -msgstr "" +msgstr "substituÃdo {new_name}" #: js/filelist.js:243 js/filelist.js:245 js/filelist.js:277 js/filelist.js:279 msgid "undo" @@ -95,126 +96,126 @@ msgstr "desfazer" #: js/filelist.js:245 msgid "replaced {new_name} with {old_name}" -msgstr "" +msgstr "SubstituÃdo {old_name} por {new_name} " #: js/filelist.js:277 msgid "unshared {files}" -msgstr "" +msgstr "{files} não compartilhados" #: js/filelist.js:279 msgid "deleted {files}" -msgstr "" +msgstr "{files} apagados" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "gerando arquivo ZIP, isso pode levar um tempo." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "ImpossÃvel enviar seus arquivo como diretório ou ele tem 0 bytes." -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Erro de envio" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Pendente" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "enviando 1 arquivo" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" -msgstr "" +msgstr "Enviando {count} arquivos" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Envio cancelado." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Upload em andamento. Sair da página agora resultará no cancelamento do envio." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Nome inválido, '/' não é permitido." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" -msgstr "" +msgstr "{count} arquivos scaneados" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "erro durante verificação" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Nome" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Tamanho" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Modificado" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" -msgstr "" +msgstr "1 pasta" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" -msgstr "" +msgstr "{count} pastas" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" -msgstr "" +msgstr "1 arquivo" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" -msgstr "" +msgstr "{count} arquivos" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "segundos atrás" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "1 minuto atrás" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" -msgstr "" +msgstr "{minutes} minutos atrás" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "hoje" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "ontem" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" -msgstr "" +msgstr "{days} dias atrás" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "último mês" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "meses atrás" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "último ano" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "anos atrás" @@ -246,7 +247,7 @@ msgstr "0 para ilimitado" msgid "Maximum input size for ZIP files" msgstr "Tamanho máximo para arquivo ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Salvar" @@ -263,43 +264,43 @@ msgid "Folder" msgstr "Pasta" #: templates/index.php:11 -msgid "From url" -msgstr "URL de origem" +msgid "From link" +msgstr "Do link" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Carregar" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Cancelar upload" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Nada aqui.Carrege alguma coisa!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Compartilhar" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Baixar" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Arquivo muito grande" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Arquivos sendo escaneados, por favor aguarde." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Scanning atual" diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po index 168bc9bcc8e..5ed1bddb4a0 100644 --- a/l10n/pt_BR/lib.po +++ b/l10n/pt_BR/lib.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <dudanogueira@gmail.com>, 2012. # <philippi.sedir@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-25 02:07+0200\n" -"PO-Revision-Date: 2012-10-24 00:11+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-11-04 00:01+0100\n" +"PO-Revision-Date: 2012-11-03 14:34+0000\n" +"Last-Translator: dudanogueira <dudanogueira@gmail.com>\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" @@ -80,47 +81,47 @@ msgstr "Texto" #: search/provider/file.php:29 msgid "Images" -msgstr "" +msgstr "Imagens" -#: template.php:87 +#: template.php:103 msgid "seconds ago" msgstr "segundos atrás" -#: template.php:88 +#: template.php:104 msgid "1 minute ago" msgstr "1 minuto atrás" -#: template.php:89 +#: template.php:105 #, php-format msgid "%d minutes ago" msgstr "%d minutos atrás" -#: template.php:92 +#: template.php:108 msgid "today" msgstr "hoje" -#: template.php:93 +#: template.php:109 msgid "yesterday" msgstr "ontem" -#: template.php:94 +#: template.php:110 #, php-format msgid "%d days ago" msgstr "%d dias atrás" -#: template.php:95 +#: template.php:111 msgid "last month" msgstr "último mês" -#: template.php:96 +#: template.php:112 msgid "months ago" msgstr "meses atrás" -#: template.php:97 +#: template.php:113 msgid "last year" msgstr "último ano" -#: template.php:98 +#: template.php:114 msgid "years ago" msgstr "anos atrás" diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po index 4ed9b3813ae..bb6d026ba97 100644 --- a/l10n/pt_PT/core.po +++ b/l10n/pt_PT/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-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-27 22:12+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-11-06 00:00+0100\n" +"PO-Revision-Date: 2012-11-05 13:51+0000\n" +"Last-Translator: Duarte Velez Grilo <duartegrilo@gmail.com>\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" @@ -34,27 +34,27 @@ msgstr "Nenhuma categoria para adicionar?" msgid "This category already exists: " msgstr "Esta categoria já existe:" -#: js/js.js:243 templates/layout.user.php:53 templates/layout.user.php:54 +#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60 msgid "Settings" msgstr "Definições" -#: js/oc-dialogs.js:123 +#: js/oc-dialogs.js:126 msgid "Choose" msgstr "Escolha" -#: js/oc-dialogs.js:143 js/oc-dialogs.js:163 +#: js/oc-dialogs.js:146 js/oc-dialogs.js:166 msgid "Cancel" msgstr "Cancelar" -#: js/oc-dialogs.js:159 +#: js/oc-dialogs.js:162 msgid "No" msgstr "Não" -#: js/oc-dialogs.js:160 +#: js/oc-dialogs.js:163 msgid "Yes" msgstr "Sim" -#: js/oc-dialogs.js:177 +#: js/oc-dialogs.js:180 msgid "Ok" msgstr "Ok" @@ -186,7 +186,7 @@ msgstr "" #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "O pedido falhou!" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 #: templates/login.php:20 @@ -319,87 +319,87 @@ msgstr "Host da base de dados" msgid "Finish setup" msgstr "Acabar instalação" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:15 templates/layout.user.php:16 msgid "Sunday" msgstr "Domingo" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:15 templates/layout.user.php:16 msgid "Monday" msgstr "Segunda" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:15 templates/layout.user.php:16 msgid "Tuesday" msgstr "Terça" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:15 templates/layout.user.php:16 msgid "Wednesday" msgstr "Quarta" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:15 templates/layout.user.php:16 msgid "Thursday" msgstr "Quinta" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:15 templates/layout.user.php:16 msgid "Friday" msgstr "Sexta" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:15 templates/layout.user.php:16 msgid "Saturday" msgstr "Sábado" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "January" msgstr "Janeiro" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "February" msgstr "Fevereiro" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "March" msgstr "Março" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "April" msgstr "Abril" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "May" msgstr "Maio" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "June" msgstr "Junho" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "July" msgstr "Julho" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "August" msgstr "Agosto" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "September" msgstr "Setembro" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "October" msgstr "Outubro" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "November" msgstr "Novembro" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "December" msgstr "Dezembro" -#: templates/layout.guest.php:42 +#: templates/layout.guest.php:41 msgid "web services under your control" msgstr "serviços web sob o seu controlo" -#: templates/layout.user.php:38 +#: templates/layout.user.php:44 msgid "Log out" msgstr "Sair" @@ -411,7 +411,7 @@ msgstr "" msgid "" "If you did not change your password recently, your account may be " "compromised!" -msgstr "" +msgstr "Se não mudou a sua palavra-passe recentemente, a sua conta pode ter sido comprometida!" #: templates/login.php:10 msgid "Please change your password to secure your account again." diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po index 5bf097b5028..52d155e3ab4 100644 --- a/l10n/pt_PT/files.po +++ b/l10n/pt_PT/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-20 02:02+0200\n" -"PO-Revision-Date: 2012-10-19 13:25+0000\n" +"POT-Creation-Date: 2012-11-06 00:00+0100\n" +"PO-Revision-Date: 2012-11-05 13:54+0000\n" "Last-Translator: Duarte Velez Grilo <duartegrilo@gmail.com>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -55,15 +55,15 @@ msgstr "Falhou a escrita no disco" msgid "Files" msgstr "Ficheiros" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Deixar de partilhar" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Apagar" -#: js/fileactions.js:182 +#: js/fileactions.js:172 msgid "Rename" msgstr "Renomear" @@ -103,116 +103,116 @@ msgstr "{files} não partilhado(s)" msgid "deleted {files}" msgstr "{files} eliminado(s)" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "a gerar o ficheiro ZIP, poderá demorar algum tempo." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Não é possÃvel fazer o envio do ficheiro devido a ser uma pasta ou ter 0 bytes" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Erro no envio" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Pendente" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "A enviar 1 ficheiro" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "A carregar {count} ficheiros" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "O envio foi cancelado." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Nome inválido, '/' não permitido." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "{count} ficheiros analisados" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "erro ao analisar" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Nome" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Tamanho" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Modificado" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 pasta" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{count} pastas" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 ficheiro" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{count} ficheiros" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "há segundos" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "há 1 minuto" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "há {minutes} minutos" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "hoje" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "ontem" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "há {days} dias" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "mês passado" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "há meses" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "ano passado" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "há anos" @@ -244,7 +244,7 @@ msgstr "0 é ilimitado" msgid "Maximum input size for ZIP files" msgstr "Tamanho máximo para ficheiros ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Guardar" @@ -261,43 +261,43 @@ msgid "Folder" msgstr "Pasta" #: templates/index.php:11 -msgid "From url" -msgstr "Do endereço" +msgid "From link" +msgstr "Da ligação" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Enviar" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Cancelar envio" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Vazio. Envie alguma coisa!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Partilhar" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Transferir" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Envio muito grande" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Os ficheiros que está a tentar enviar excedem o tamanho máximo de envio permitido neste servidor." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Os ficheiros estão a ser analisados, por favor aguarde." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Análise actual" diff --git a/l10n/ro/files.po b/l10n/ro/files.po index 4b36b837b64..27425ca496c 100644 --- a/l10n/ro/files.po +++ b/l10n/ro/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -55,15 +55,15 @@ msgstr "Eroare la scriere pe disc" msgid "Files" msgstr "FiÈ™iere" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Anulează partajarea" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Șterge" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Redenumire" @@ -103,116 +103,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "se generază fiÈ™ierul ZIP, va dura ceva timp." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Nu s-a putut încărca fiÈ™ierul tău deoarece pare să fie un director sau are 0 bytes." -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Eroare la încărcare" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "ÃŽn aÈ™teptare" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "un fiÈ™ier se încarcă" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "ÃŽncărcare anulată." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "FiÈ™ierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Nume invalid, '/' nu este permis." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "eroare la scanarea" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Nume" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Dimensiune" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Modificat" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "secunde în urmă" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "1 minut în urmă" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "astăzi" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "ieri" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "ultima lună" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "luni în urmă" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "ultimul an" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "ani în urmă" @@ -244,7 +244,7 @@ msgstr "0 e nelimitat" msgid "Maximum input size for ZIP files" msgstr "Dimensiunea maximă de intrare pentru fiÈ™iere compresate" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Salvare" @@ -261,43 +261,43 @@ msgid "Folder" msgstr "Dosar" #: templates/index.php:11 -msgid "From url" -msgstr "De la URL" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "ÃŽncarcă" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Anulează încărcarea" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Nimic aici. ÃŽncarcă ceva!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Partajează" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Descarcă" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "FiÈ™ierul încărcat este prea mare" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "FiÈ™ierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "FiÈ™ierele sunt scanate, te rog aÈ™teptă." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "ÃŽn curs de scanare" diff --git a/l10n/ru/core.po b/l10n/ru/core.po index 49c13a73184..3b343925a56 100644 --- a/l10n/ru/core.po +++ b/l10n/ru/core.po @@ -5,6 +5,7 @@ # Translators: # Denis <reg.transifex.net@demitel.ru>, 2012. # <jekader@gmail.com>, 2011, 2012. +# <k0ldbl00d@gmail.com>, 2012. # <skoptev@ukr.net>, 2012. # <tony.mccourin@gmail.com>, 2011. # Victor Bravo <>, 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-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-27 22:12+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-10-31 00:01+0100\n" +"PO-Revision-Date: 2012-10-30 06:32+0000\n" +"Last-Translator: k0ldbl00d <k0ldbl00d@gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -183,11 +184,11 @@ msgstr "Ðа ваш Ð°Ð´Ñ€ÐµÑ Email выÑлана ÑÑылка Ð´Ð»Ñ Ñбро #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "Отправка пиÑьма Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÐµÐ¹ Ð´Ð»Ñ ÑброÑа." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ðµ удалÑÑ!" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 #: templates/login.php:20 diff --git a/l10n/ru/files.po b/l10n/ru/files.po index cca70f20e74..6787003dd33 100644 --- a/l10n/ru/files.po +++ b/l10n/ru/files.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-20 02:02+0200\n" -"PO-Revision-Date: 2012-10-19 12:30+0000\n" -"Last-Translator: skoptev <skoptev@ukr.net>\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" +"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -59,15 +59,15 @@ msgstr "Ошибка запиÑи на диÑк" msgid "Files" msgstr "Файлы" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Отменить публикацию" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Удалить" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Переименовать" @@ -107,116 +107,116 @@ msgstr "не опубликованные {files}" msgid "deleted {files}" msgstr "удаленные {files}" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "Ñоздание ZIP-файла, Ñто может занÑÑ‚ÑŒ некоторое времÑ." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Ðе удаетÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ файл размером 0 байт в каталог" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Ошибка загрузки" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Ожидание" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "загружаетÑÑ 1 файл" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "{count} файлов загружаетÑÑ" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Загрузка отменена." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Файл в процеÑÑе загрузки. Покинув Ñтраницу вы прервёте загрузку." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Ðеверное имÑ, '/' не допуÑкаетÑÑ." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "{count} файлов проÑканировано" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "ошибка во Ð²Ñ€ÐµÐ¼Ñ ÑанированиÑ" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Ðазвание" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Размер" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Изменён" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 папка" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{count} папок" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 файл" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{count} файлов" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "неÑколько Ñекунд назад" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "1 минуту назад" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "{minutes} минут назад" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "ÑегоднÑ" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "вчера" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "{days} дней назад" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "в прошлом меÑÑце" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "неÑколько меÑÑцев назад" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "в прошлом году" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "неÑколько лет назад" @@ -248,7 +248,7 @@ msgstr "0 - без ограничений" msgid "Maximum input size for ZIP files" msgstr "МакÑимальный иÑходный размер Ð´Ð»Ñ ZIP файлов" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Сохранить" @@ -265,43 +265,43 @@ msgid "Folder" msgstr "Папка" #: templates/index.php:11 -msgid "From url" -msgstr "С url" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Загрузить" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Отмена загрузки" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "ЗдеÑÑŒ ничего нет. Загрузите что-нибудь!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Опубликовать" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Скачать" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Файл Ñлишком большой" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Файлы, которые Ð’Ñ‹ пытаетеÑÑŒ загрузить, превышают лимит Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² на Ñтом Ñервере." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Подождите, файлы ÑканируютÑÑ." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Текущее Ñканирование" diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po index eff2ca1daed..f6f85e098e7 100644 --- a/l10n/ru/lib.po +++ b/l10n/ru/lib.po @@ -4,15 +4,16 @@ # # Translators: # Denis <reg.transifex.net@demitel.ru>, 2012. +# <k0ldbl00d@gmail.com>, 2012. # <mpolr21@gmail.com>, 2012. # <victor.dubiniuk@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-25 02:07+0200\n" -"PO-Revision-Date: 2012-10-24 00:11+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-10-31 00:01+0100\n" +"PO-Revision-Date: 2012-10-30 06:32+0000\n" +"Last-Translator: k0ldbl00d <k0ldbl00d@gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -82,47 +83,47 @@ msgstr "ТекÑÑ‚" #: search/provider/file.php:29 msgid "Images" -msgstr "" +msgstr "ИзображениÑ" -#: template.php:87 +#: template.php:103 msgid "seconds ago" msgstr "менее минуты" -#: template.php:88 +#: template.php:104 msgid "1 minute ago" msgstr "1 минуту назад" -#: template.php:89 +#: template.php:105 #, php-format msgid "%d minutes ago" msgstr "%d минут назад" -#: template.php:92 +#: template.php:108 msgid "today" msgstr "ÑегоднÑ" -#: template.php:93 +#: template.php:109 msgid "yesterday" msgstr "вчера" -#: template.php:94 +#: template.php:110 #, php-format msgid "%d days ago" msgstr "%d дней назад" -#: template.php:95 +#: template.php:111 msgid "last month" msgstr "в прошлом меÑÑце" -#: template.php:96 +#: template.php:112 msgid "months ago" msgstr "меÑÑцы назад" -#: template.php:97 +#: template.php:113 msgid "last year" msgstr "в прошлом году" -#: template.php:98 +#: template.php:114 msgid "years ago" msgstr "годы назад" diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po index 0ed0fdd4f15..c32a2a92f58 100644 --- a/l10n/ru_RU/core.po +++ b/l10n/ru_RU/core.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-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-27 22:12+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-10-30 00:01+0100\n" +"PO-Revision-Date: 2012-10-29 07:47+0000\n" +"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -178,11 +178,11 @@ msgstr "Ð’Ñ‹ получите ÑÑылку Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ email." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "Ðе удалоÑÑŒ выполнить запроÑ!" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 #: templates/login.php:20 diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po index b086bc413be..4936c097477 100644 --- a/l10n/ru_RU/files.po +++ b/l10n/ru_RU/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-10-23 02:02+0200\n" -"PO-Revision-Date: 2012-10-22 08:42+0000\n" -"Last-Translator: skoptev <skoptev@ukr.net>\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-02 06:33+0000\n" +"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -53,15 +53,15 @@ msgstr "Ðе удалоÑÑŒ запиÑать на диÑк" msgid "Files" msgstr "Файлы" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Скрыть" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Удалить" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Переименовать" @@ -101,116 +101,116 @@ msgstr "CовмеÑтное иÑпользование прекращено {Ñ„Ð msgid "deleted {files}" msgstr "удалено {файлы}" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "Создание ZIP-файла, Ñто может занÑÑ‚ÑŒ некоторое времÑ." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Ðевозможно загрузить файл,\n так как он имеет нулевой размер или ÑвлÑетÑÑ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÐµÐ¹" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Ошибка загрузки" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Ожидающий решениÑ" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "загрузка 1 файла" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "{количеÑтво} загружено файлов" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Загрузка отменена" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "ПроцеÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ файла. ЕÑли покинуть Ñтраницу ÑейчаÑ, загрузка будет отменена." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Ðеправильное имÑ, '/' не допуÑкаетÑÑ." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "{количеÑтво} файлов отÑканировано" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "ошибка при Ñканировании" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "ИмÑ" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Размер" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Изменен" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 папка" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{количеÑтво} папок" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 файл" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{количеÑтво} файлов" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "Ñекунд назад" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "1 минуту назад" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "{minutes} минут назад" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "ÑегоднÑ" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "вчера" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "{days} дней назад" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "в прошлом меÑÑце" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "меÑÑцев назад" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "в прошлом году" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "лет назад" @@ -242,7 +242,7 @@ msgstr "0 без ограничений" msgid "Maximum input size for ZIP files" msgstr "МакÑимальный размер входÑщих ZIP-файлов " -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Сохранить" @@ -259,43 +259,43 @@ msgid "Folder" msgstr "Папка" #: templates/index.php:11 -msgid "From url" -msgstr "Из url" +msgid "From link" +msgstr "По ÑÑылке" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Загрузить " -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Отмена загрузки" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "ЗдеÑÑŒ ничего нет. Загрузите что-нибудь!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Сделать общим" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Загрузить" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Загрузка Ñлишком велика" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Размер файлов, которые Ð’Ñ‹ пытаетеÑÑŒ загрузить, превышает макÑимально допуÑтимый размер Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ на данный Ñервер." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Файлы ÑканируютÑÑ, пожалуйÑта, подождите." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Текущее Ñканирование" diff --git a/l10n/ru_RU/lib.po b/l10n/ru_RU/lib.po index 0f021e2aae2..360a00db345 100644 --- a/l10n/ru_RU/lib.po +++ b/l10n/ru_RU/lib.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-10-25 02:07+0200\n" -"PO-Revision-Date: 2012-10-24 00:11+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-10-30 00:01+0100\n" +"PO-Revision-Date: 2012-10-29 08:02+0000\n" +"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -80,47 +80,47 @@ msgstr "ТекÑÑ‚" #: search/provider/file.php:29 msgid "Images" -msgstr "" +msgstr "ИзображениÑ" -#: template.php:87 +#: template.php:103 msgid "seconds ago" msgstr "Ñекунд назад" -#: template.php:88 +#: template.php:104 msgid "1 minute ago" msgstr "1 минуту назад" -#: template.php:89 +#: template.php:105 #, php-format msgid "%d minutes ago" msgstr "%d минут назад" -#: template.php:92 +#: template.php:108 msgid "today" msgstr "ÑегоднÑ" -#: template.php:93 +#: template.php:109 msgid "yesterday" msgstr "вчера" -#: template.php:94 +#: template.php:110 #, php-format msgid "%d days ago" msgstr "%d дней назад" -#: template.php:95 +#: template.php:111 msgid "last month" msgstr "в прошлом меÑÑце" -#: template.php:96 +#: template.php:112 msgid "months ago" msgstr "меÑÑц назад" -#: template.php:97 +#: template.php:113 msgid "last year" msgstr "в прошлом году" -#: template.php:98 +#: template.php:114 msgid "years ago" msgstr "год назад" diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po index 1c83b3f41d2..d740f96064f 100644 --- a/l10n/si_LK/core.po +++ b/l10n/si_LK/core.po @@ -3,14 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Anushke Guneratne <anushke@gmail.com>, 2012. # Chamara Disanayake <chamara@nic.lk>, 2012. +# <thanojar@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-27 22:12+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-11-01 00:01+0100\n" +"PO-Revision-Date: 2012-10-31 09:15+0000\n" +"Last-Translator: Thanoja <thanojar@gmail.com>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,23 +36,23 @@ msgstr "" msgid "Settings" msgstr "à·ƒà·à¶šà·ƒà·”ම්" -#: js/oc-dialogs.js:123 +#: js/oc-dialogs.js:126 msgid "Choose" msgstr "à¶à·à¶»à¶±à·Šà¶±" -#: js/oc-dialogs.js:143 js/oc-dialogs.js:163 +#: js/oc-dialogs.js:146 js/oc-dialogs.js:166 msgid "Cancel" msgstr "එපà·" -#: js/oc-dialogs.js:159 +#: js/oc-dialogs.js:162 msgid "No" msgstr "නà·à·„à·" -#: js/oc-dialogs.js:160 +#: js/oc-dialogs.js:163 msgid "Yes" msgstr "ඔව්" -#: js/oc-dialogs.js:177 +#: js/oc-dialogs.js:180 msgid "Ok" msgstr "හරි" @@ -85,15 +87,15 @@ msgstr "" #: js/share.js:158 msgid "Share with" -msgstr "" +msgstr "බෙදà·à¶œà¶±à·Šà¶±" #: js/share.js:163 msgid "Share with link" -msgstr "" +msgstr "යොමුවක් මඟින් බෙදà·à¶œà¶±à·Šà¶±" #: js/share.js:164 msgid "Password protect" -msgstr "" +msgstr "මුර පදයකින් ආරක්à·à·à¶šà¶»à¶±à·Šà¶±" #: js/share.js:168 templates/installation.php:42 templates/login.php:24 #: templates/verify.php:13 @@ -102,15 +104,15 @@ msgstr "මුර පදය " #: js/share.js:173 msgid "Set expiration date" -msgstr "" +msgstr "කල් ඉකුà¶à·Š විමේ දිනය දමන්න" #: js/share.js:174 msgid "Expiration date" -msgstr "" +msgstr "කල් ඉකුà¶à·Š විමේ දිනය" #: js/share.js:206 msgid "Share via email:" -msgstr "" +msgstr "විද්â€à¶ºà·”à¶à·Š à¶à·à¶´à·‘ල මඟින් බෙදà·à¶œà¶±à·Šà¶±: " #: js/share.js:208 msgid "No people found" @@ -130,11 +132,11 @@ msgstr "නොබෙදු" #: js/share.js:304 msgid "can edit" -msgstr "" +msgstr "සංස්කරණය කළ à·„à·à¶š" #: js/share.js:306 msgid "access control" -msgstr "" +msgstr "ප්â€à¶»à·€à·šà· පà·à¶½à¶±à¶º" #: js/share.js:309 msgid "create" @@ -146,23 +148,23 @@ msgstr "" #: js/share.js:315 msgid "delete" -msgstr "" +msgstr "මකන්න" #: js/share.js:318 msgid "share" -msgstr "" +msgstr "බෙදà·à·„දà·à¶œà¶±à·Šà¶±" #: js/share.js:343 js/share.js:512 js/share.js:514 msgid "Password protected" -msgstr "" +msgstr "මුර පදයකින් ආරක්à·à·à¶šà¶» ඇà¶" #: js/share.js:525 msgid "Error unsetting expiration date" -msgstr "" +msgstr "කල් ඉකුà¶à·Š දිනය ඉවà¶à·Š කිරීමේ දà·à·‚යක්" #: js/share.js:537 msgid "Error setting expiration date" -msgstr "" +msgstr "කල් ඉකුà¶à·Š දිනය ස්ථà·à¶´à¶±à¶º කිරීමේ දà·à·‚යක්" #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -182,7 +184,7 @@ msgstr "" #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "ඉල්ලීම අසà·à¶»à·Šà¶®à¶šà¶ºà·’!" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 #: templates/login.php:20 @@ -231,11 +233,11 @@ msgstr "උදව්" #: templates/403.php:12 msgid "Access forbidden" -msgstr "" +msgstr "ඇà¶à·”ල් වීම à¶à·„නම්" #: templates/404.php:12 msgid "Cloud not found" -msgstr "" +msgstr "සොය෠ගචනොහà·à¶š" #: templates/edit_categories_dialog.php:4 msgid "Edit categories" @@ -247,7 +249,7 @@ msgstr "එක් කරන්න" #: templates/installation.php:23 templates/installation.php:31 msgid "Security Warning" -msgstr "" +msgstr "ආරක්ෂක නිවේදනයක්" #: templates/installation.php:24 msgid "" @@ -259,7 +261,7 @@ msgstr "" msgid "" "Without a secure random number generator an attacker may be able to predict " "password reset tokens and take over your account." -msgstr "" +msgstr "ආරක්ෂිචඅහඹු සංඛ්â€à¶ºà· උà¶à·Šà¶´à·à¶¯à¶šà¶ºà¶šà·Š නොමà·à¶à·’ නම් ඔබගේ ගිණුමට පහරදෙන අයකුට එහි මුරපද යළි පිහිටුවීමට අවà·à·Šâ€à¶º ටà·à¶šà¶± පහසුවෙන් සොයà·à¶œà·™à¶± ඔබගේ ගිණුම පà·à·„à·à¶»à¶œà¶ à·„à·à¶š." #: templates/installation.php:32 msgid "" @@ -284,7 +286,7 @@ msgstr "දà¶à·Šà¶ à·†à·à¶½à·Šà¶©à¶»à¶º" #: templates/installation.php:57 msgid "Configure the database" -msgstr "" +msgstr "දà¶à·Šà¶ සමුදà·à¶º à·„à·à¶©à¶œà·à·ƒà·“ම" #: templates/installation.php:62 templates/installation.php:73 #: templates/installation.php:83 templates/installation.php:93 @@ -293,15 +295,15 @@ msgstr "" #: templates/installation.php:105 msgid "Database user" -msgstr "" +msgstr "දà¶à·Šà¶à¶œà¶¶à¶©à· භà·à·€à·’à¶à·à¶šà¶»à·”" #: templates/installation.php:109 msgid "Database password" -msgstr "" +msgstr "දà¶à·Šà¶à¶œà¶¶à¶©à·à·€à·š මුරපදය" #: templates/installation.php:113 msgid "Database name" -msgstr "" +msgstr "දà¶à·Šà¶à¶œà¶¶à¶©à·à·€à·š නම" #: templates/installation.php:121 msgid "Database tablespace" @@ -309,11 +311,11 @@ msgstr "" #: templates/installation.php:127 msgid "Database host" -msgstr "" +msgstr "දà¶à·Šà¶à¶œà¶¶à¶©à· සේවà·à¶¯à·à¶ºà¶šà¶ºà·" #: templates/installation.php:132 msgid "Finish setup" -msgstr "" +msgstr "ස්ථà·à¶´à¶±à¶º කිරීම අවසන් කරන්න" #: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Sunday" @@ -397,7 +399,7 @@ msgstr "ඔබට පà·à¶½à¶±à¶º කළ à·„à·à¶šà·’ වෙබ් සේවà·à #: templates/layout.user.php:38 msgid "Log out" -msgstr "" +msgstr "නික්මීම" #: templates/login.php:8 msgid "Automatic logon rejected!" @@ -415,23 +417,23 @@ msgstr "" #: templates/login.php:15 msgid "Lost your password?" -msgstr "" +msgstr "මුරපදය අමà¶à¶šà¶¯?" #: templates/login.php:27 msgid "remember" -msgstr "" +msgstr "මà¶à¶š à¶à¶¶à·à¶œà¶±à·Šà¶±" #: templates/login.php:28 msgid "Log in" -msgstr "" +msgstr "ප්â€à¶»à·€à·šà·à·€à¶±à·Šà¶±" #: templates/logout.php:1 msgid "You are logged out." -msgstr "" +msgstr "ඔබ නික්මී ඇà¶." #: templates/part.pagenavi.php:3 msgid "prev" -msgstr "" +msgstr "පෙර" #: templates/part.pagenavi.php:20 msgid "next" diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po index 2be63f80f5b..73fafd17740 100644 --- a/l10n/si_LK/files.po +++ b/l10n/si_LK/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-10-20 02:02+0200\n" -"PO-Revision-Date: 2012-10-19 08:53+0000\n" -"Last-Translator: Anushke Guneratne <anushke@gmail.com>\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" +"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +25,7 @@ msgstr "නිවà·à¶»à¶¯à·’ à·€ ගොනුව උඩුගචකෙරිච#: ajax/upload.php:21 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini" -msgstr "" +msgstr "php.ini à·„à·’ upload_max_filesize නියමයට වඩ෠උඩුගචකළ ගොනුව විà·à·à¶½à¶ºà·’" #: ajax/upload.php:22 msgid "" @@ -43,7 +43,7 @@ msgstr "කිසිදු ගොනවක් උඩුගචනොවිනි #: ajax/upload.php:25 msgid "Missing a temporary folder" -msgstr "" +msgstr "à¶à·à·€à¶šà·à¶½à·’ක ෆොල්ඩරයක් සොයà·à¶œà¶ නොහà·à¶š" #: ajax/upload.php:26 msgid "Failed to write to disk" @@ -53,15 +53,15 @@ msgstr "à¶à·à¶§à·’ගචකිරීම අසà·à¶»à·Šà¶®à¶šà¶ºà·’" msgid "Files" msgstr "ගොනු" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" -msgstr "" +msgstr "නොබෙදු" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "මකන්න" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "නà·à·€à¶ නම් කරන්න" @@ -101,118 +101,118 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "" -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "උඩුගචකිරීමේ දà·à·à¶ºà¶šà·Š" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "උඩුගචකිරීම අà¶à·Š හරින්න ලදී" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "නම" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "ප්â€à¶»à¶¸à·à¶«à¶º" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" -msgstr "" +msgstr "වෙනස් කළ" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 ගොනුවක්" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" -msgstr "" +msgstr "à¶à¶à·Šà¶´à¶»à¶ºà¶±à·Šà¶§ පෙර" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "1 මිනිà¶à·Šà¶à·”වකට පෙර" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "අද" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "පෙර දින" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" -msgstr "" +msgstr "පෙර මà·à·ƒà¶ºà·š" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" -msgstr "" +msgstr "මà·à·ƒ කීපයකට පෙර" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" -msgstr "" +msgstr "පෙර අවුරුද්දේ" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" -msgstr "" +msgstr "අවුරුදු කීපයකට පෙර" #: templates/admin.php:5 msgid "File handling" @@ -236,13 +236,13 @@ msgstr "" #: templates/admin.php:11 msgid "0 is unlimited" -msgstr "" +msgstr "0 යනු සීමà·à·€à¶šà·Š නà·à¶à·’ බවය" #: templates/admin.php:12 msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "සුරකින්න" @@ -259,43 +259,43 @@ msgid "Folder" msgstr "à·†à·à¶½à·Šà¶©à¶»à¶º" #: templates/index.php:11 -msgid "From url" +msgid "From link" msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "උඩුගචකිරීම" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "උඩුගචකිරීම අà¶à·Š හරින්න" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "මෙහි කිසිවක් නොමà·à¶. යමක් උඩුගචකරන්න" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" -msgstr "" +msgstr "බෙදà·à·„දà·à¶œà¶±à·Šà¶±" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "බà·à¶œà¶ කිරීම" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "උඩුගචකිරීම විà·à·à¶½ à·€à·à¶©à·’ය" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." -msgstr "" +msgstr "ඔබ උඩුගචකිරීමට à¶à·à¶à·Š කරන ගොනු මෙම සේවà·à¶¯à·à¶ºà¶šà¶ºà· උඩුගචකිරීමට ඉඩදී ඇà¶à·’ උපරිම ගොනු විà·à·à¶½à¶à·Šà·€à¶ºà¶§ වඩ෠වà·à¶©à·’ය" -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "" diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po index b22abe37334..0b7793a0ad7 100644 --- a/l10n/si_LK/settings.po +++ b/l10n/si_LK/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-27 00:01+0200\n" -"PO-Revision-Date: 2012-10-26 08:03+0000\n" -"Last-Translator: Chamara Disanayake <chamara@nic.lk>\n" +"POT-Creation-Date: 2012-11-02 00:04+0100\n" +"PO-Revision-Date: 2012-11-01 08:56+0000\n" +"Last-Translator: Anushke Guneratne <anushke@gmail.com>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,60 +20,60 @@ msgstr "" "Language: si_LK\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/apps/ocs.php:23 +#: ajax/apps/ocs.php:20 msgid "Unable to load list from App Store" msgstr "" -#: ajax/creategroup.php:12 +#: ajax/creategroup.php:10 msgid "Group already exists" msgstr "කණ්ඩà·à¶ºà¶¸ දà·à¶±à¶§à¶¸à¶à·Š à¶à·’බේ" -#: ajax/creategroup.php:21 +#: ajax/creategroup.php:19 msgid "Unable to add group" msgstr "කà·à¶«à¶©à¶ºà¶šà·Š එක් කළ නොහà·à¶šà·’ විය" -#: ajax/enableapp.php:14 +#: ajax/enableapp.php:12 msgid "Could not enable app. " msgstr "යෙදුම සක්â€à¶»à·“ය කළ නොහà·à¶šà·’ විය." -#: ajax/lostpassword.php:14 +#: ajax/lostpassword.php:12 msgid "Email saved" -msgstr "" +msgstr "වි-à¶à·à¶´à·‘ල සුරකින ලදී" -#: ajax/lostpassword.php:16 +#: ajax/lostpassword.php:14 msgid "Invalid email" -msgstr "" +msgstr "අවලංගු වි-à¶à·à¶´à·‘ල" -#: ajax/openid.php:16 +#: ajax/openid.php:13 msgid "OpenID Changed" msgstr "" -#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23 +#: ajax/openid.php:15 ajax/setlanguage.php:17 ajax/setlanguage.php:20 msgid "Invalid request" msgstr "අවලංගු අයදුම" -#: ajax/removegroup.php:16 +#: ajax/removegroup.php:13 msgid "Unable to delete group" msgstr "කණ්ඩà·à¶ºà¶¸ මà·à¶šà·“මට නොහà·à¶š" -#: ajax/removeuser.php:18 ajax/setquota.php:18 ajax/togglegroups.php:15 +#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:12 msgid "Authentication error" msgstr "" -#: ajax/removeuser.php:27 +#: ajax/removeuser.php:24 msgid "Unable to delete user" msgstr "පරිà·à·“ලකය෠මà·à¶šà·“මට නොහà·à¶š" -#: ajax/setlanguage.php:18 +#: ajax/setlanguage.php:15 msgid "Language changed" msgstr "භà·à·‚à·à·€ à·à·€à¶±à·ƒà·Š කිරීම" -#: ajax/togglegroups.php:25 +#: ajax/togglegroups.php:22 #, php-format msgid "Unable to add user to group %s" msgstr "පරිà·à·“ලකය෠%s කණ්ඩà·à¶ºà¶¸à¶§ එකà¶à·” කළ නොහà·à¶š" -#: ajax/togglegroups.php:31 +#: ajax/togglegroups.php:28 #, php-format msgid "Unable to remove user from group %s" msgstr "පරිà·à·“ලකය෠%s කණ්ඩà·à¶ºà¶¸à·’න් ඉවà¶à·Š කළ නොහà·à¶š" @@ -96,7 +96,7 @@ msgstr "" #: templates/admin.php:14 msgid "Security Warning" -msgstr "" +msgstr "ආරක්ෂක නිවේදනයක්" #: templates/admin.php:17 msgid "" @@ -248,7 +248,7 @@ msgstr "මුර පදය වෙනස් කළ නොහà·à¶šà·’ විය" #: templates/personal.php:21 msgid "Current password" -msgstr "නූà¶à¶± මුරපදය" +msgstr "à·€à¶à·Šà¶¸à¶±à·Š මුරපදය" #: templates/personal.php:22 msgid "New password" @@ -300,11 +300,11 @@ msgstr "සමූහය" #: templates/users.php:32 msgid "Create" -msgstr "à¶à¶±à¶±à·€à·" +msgstr "à¶à¶±à¶±à·Šà¶±" #: templates/users.php:35 msgid "Default Quota" -msgstr "" +msgstr "à·ƒà·à¶¸à·à¶±à·Šâ€à¶º සලà·à¶šà¶º" #: templates/users.php:55 templates/users.php:138 msgid "Other" diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po index 01d9c3a683c..222a90cb0a5 100644 --- a/l10n/sk_SK/files.po +++ b/l10n/sk_SK/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-26 02:02+0200\n" -"PO-Revision-Date: 2012-10-25 18:52+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-02 08:24+0000\n" "Last-Translator: Roman Priesol <roman@priesol.net>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -54,15 +54,15 @@ msgstr "Zápis na disk sa nepodaril" msgid "Files" msgstr "Súbory" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "NezdielaÅ¥" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "OdstrániÅ¥" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "PremenovaÅ¥" @@ -102,116 +102,116 @@ msgstr "zdieľanie zruÅ¡ené pre {files}" msgid "deleted {files}" msgstr "zmazané {files}" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "generujem ZIP-súbor, môže to chvÃľu trvaÅ¥." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Nemôžem nahraÅ¥ súbor lebo je to prieÄinok alebo má 0 bajtov." -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Chyba odosielania" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "ÄŒaká sa" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "1 súbor sa posiela " -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "{count} súborov odosielaných" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Odosielanie zruÅ¡ené" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Opustenie stránky zruÅ¡Ã práve prebiehajúce odosielanie súboru." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Chybný názov, \"/\" nie je povolené" -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "{count} súborov prehľadaných" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "chyba poÄas kontroly" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Meno" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "VeľkosÅ¥" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Upravené" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 prieÄinok" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{count} prieÄinkov" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 súbor" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{count} súborov" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "pred sekundami" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "pred minútou" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "pred {minutes} minútami" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "dnes" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "vÄera" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "pred {days} dňami" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "minulý mesiac" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "pred mesiacmi" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "minulý rok" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "pred rokmi" @@ -243,7 +243,7 @@ msgstr "0 znamená neobmedzené" msgid "Maximum input size for ZIP files" msgstr "NajväÄÅ¡ia veľkosÅ¥ ZIP súborov" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "UložiÅ¥" @@ -260,43 +260,43 @@ msgid "Folder" msgstr "PrieÄinok" #: templates/index.php:11 -msgid "From url" -msgstr "Z url" +msgid "From link" +msgstr "Z odkazu" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "OdoslaÅ¥" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "ZruÅ¡iÅ¥ odosielanie" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Žiadny súbor. Nahrajte nieÄo!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "ZdielaÅ¥" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "StiahnuÅ¥" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Odosielaný súbor je prÃliÅ¡ veľký" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Súbory, ktoré sa snažÃte nahraÅ¥, presahujú maximálnu veľkosÅ¥ pre nahratie súborov na tento server." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "ÄŒakajte, súbory sú prehľadávané." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Práve prehliadané" diff --git a/l10n/sl/files.po b/l10n/sl/files.po index 11b6d1970d6..67faee7d813 100644 --- a/l10n/sl/files.po +++ b/l10n/sl/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-24 02:02+0200\n" -"PO-Revision-Date: 2012-10-23 12:42+0000\n" -"Last-Translator: mateju <>\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" +"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,15 +55,15 @@ msgstr "Pisanje na disk je spodletelo" msgid "Files" msgstr "Datoteke" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Odstrani iz souporabe" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "IzbriÅ¡i" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Preimenuj" @@ -103,116 +103,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "Ustvarjanje datoteke ZIP. To lahko traja nekaj Äasa." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "PoÅ¡iljanje ni mogoÄe, saj gre za mapo, ali pa je datoteka velikosti 0 bajtov." -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Napaka med nalaganjem" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "V Äakanju ..." -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "PoÅ¡iljanje 1 datoteke" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "PoÅ¡iljanje je preklicano." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "V teku je poÅ¡iljanje datoteke. ÄŒe zapustite to stran zdaj, bo poÅ¡iljanje preklicano." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Neveljavno ime. Znak '/' ni dovoljen." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "napaka med pregledovanjem datotek" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Ime" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Velikost" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Spremenjeno" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 mapa" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 datoteka" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "sekund nazaj" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "Pred 1 minuto" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "danes" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "vÄeraj" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "zadnji mesec" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "mesecev nazaj" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "lansko leto" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "let nazaj" @@ -244,7 +244,7 @@ msgstr "0 je neskonÄno" msgid "Maximum input size for ZIP files" msgstr "NajveÄja vhodna velikost za datoteke ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Shrani" @@ -261,43 +261,43 @@ msgid "Folder" msgstr "Mapa" #: templates/index.php:11 -msgid "From url" -msgstr "Iz naslova URL" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "PoÅ¡lji" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "PrekliÄi poÅ¡iljanje" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Tukaj ni niÄesar. Naložite kaj!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Souporaba" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Prejmi" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Nalaganje ni mogoÄe, ker je preveliko" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Datoteke, ki jih želite naložiti, presegajo najveÄjo dovoljeno velikost na tem strežniku." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Poteka preuÄevanje datotek, poÄakajte ..." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Trenutno poteka preuÄevanje" diff --git a/l10n/sr/files.po b/l10n/sr/files.po index 0c640a31717..03853ba2f9a 100644 --- a/l10n/sr/files.po +++ b/l10n/sr/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" @@ -52,15 +52,15 @@ msgstr "" msgid "Files" msgstr "Фајлови" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Обриши" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "" @@ -100,116 +100,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "" -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Име" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Величина" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Задња измена" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "" @@ -241,9 +241,9 @@ msgstr "" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Сними" #: templates/index.php:7 msgid "New" @@ -258,43 +258,43 @@ msgid "Folder" msgstr "фаÑцикла" #: templates/index.php:11 -msgid "From url" +msgid "From link" msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Пошаљи" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Овде нема ничег. Пошаљите нешто!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Преузми" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Пошиљка је превелика" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Фајлови које желите да пошаљете превазилазе ограничење макÑималне величине пошиљке на овом Ñерверу." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "" diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po index 08b5ae3f180..e51bae6564b 100644 --- a/l10n/sr@latin/files.po +++ b/l10n/sr@latin/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -52,15 +52,15 @@ msgstr "" msgid "Files" msgstr "Fajlovi" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "ObriÅ¡i" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "" @@ -100,116 +100,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "" -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Ime" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "VeliÄina" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Zadnja izmena" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "" @@ -241,9 +241,9 @@ msgstr "" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Snimi" #: templates/index.php:7 msgid "New" @@ -258,43 +258,43 @@ msgid "Folder" msgstr "" #: templates/index.php:11 -msgid "From url" +msgid "From link" msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "PoÅ¡alji" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Ovde nema niÄeg. PoÅ¡aljite neÅ¡to!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Preuzmi" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "PoÅ¡iljka je prevelika" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Fajlovi koje želite da poÅ¡aljete prevazilaze ograniÄenje maksimalne veliÄine poÅ¡iljke na ovom serveru." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "" diff --git a/l10n/sv/core.po b/l10n/sv/core.po index fee92878118..5c50e4cd737 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-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-27 22:12+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-10-30 00:01+0100\n" +"PO-Revision-Date: 2012-10-29 18:32+0000\n" +"Last-Translator: Magnus Höglund <magnus@linux.com>\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" @@ -183,11 +183,11 @@ msgstr "Du fÃ¥r en länk att Ã¥terställa ditt lösenord via e-post." #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "Ã…terställ skickad e-post." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "Begäran misslyckades!" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 #: templates/login.php:20 diff --git a/l10n/sv/files.po b/l10n/sv/files.po index 1d5ac5b02f6..ec6893a022e 100644 --- a/l10n/sv/files.po +++ b/l10n/sv/files.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-20 02:02+0200\n" -"PO-Revision-Date: 2012-10-19 09:21+0000\n" +"POT-Creation-Date: 2012-11-04 00:00+0100\n" +"PO-Revision-Date: 2012-11-03 09:10+0000\n" "Last-Translator: Magnus Höglund <magnus@linux.com>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" @@ -57,15 +57,15 @@ msgstr "Misslyckades spara till disk" msgid "Files" msgstr "Filer" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Sluta dela" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Radera" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Byt namn" @@ -105,116 +105,116 @@ msgstr "stoppad delning {files}" msgid "deleted {files}" msgstr "raderade {files}" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "genererar ZIP-fil, det kan ta lite tid." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes." -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Uppladdningsfel" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Väntar" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "1 filuppladdning" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "{count} filer laddas upp" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Uppladdning avbruten." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Filuppladdning pÃ¥gÃ¥r. Lämnar du sidan sÃ¥ avbryts uppladdningen." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Ogiltigt namn, '/' är inte tillÃ¥ten." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "{count} filer skannade" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "fel vid skanning" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Namn" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Storlek" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Ändrad" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 mapp" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{count} mappar" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 fil" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{count} filer" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "sekunder sedan" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "1 minut sedan" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "{minutes} minuter sedan" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "i dag" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "i gÃ¥r" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "{days} dagar sedan" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "förra mÃ¥naden" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "mÃ¥nader sedan" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "förra Ã¥ret" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "Ã¥r sedan" @@ -246,7 +246,7 @@ msgstr "0 är oändligt" msgid "Maximum input size for ZIP files" msgstr "Största tillÃ¥tna storlek för ZIP-filer" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "Spara" @@ -263,43 +263,43 @@ msgid "Folder" msgstr "Mapp" #: templates/index.php:11 -msgid "From url" -msgstr "FrÃ¥n webbadress" +msgid "From link" +msgstr "FrÃ¥n länk" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Ladda upp" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Avbryt uppladdning" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Ingenting här. Ladda upp nÃ¥got!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Dela" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Ladda ner" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "För stor uppladdning" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar pÃ¥ servern." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Filer skannas, var god vänta" -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Aktuell skanning" diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po index ea5b32c7cb0..92b40d6f90e 100644 --- a/l10n/ta_LK/core.po +++ b/l10n/ta_LK/core.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-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-27 22:12+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-10-31 00:01+0100\n" +"PO-Revision-Date: 2012-10-30 08:57+0000\n" +"Last-Translator: suganthi <suganthi@nic.lk>\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -178,11 +178,11 @@ msgstr "நீஙà¯à®•à®³à¯ மினà¯à®©à®žà¯à®šà®²à¯ மூலம௠உ #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "மினà¯à®©à¯à®žà¯à®šà®²à¯ அனà¯à®ªà¯à®ªà¯à®¤à®²à¯ˆ மீளமைகà¯à®•à¯à®•" #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "வேணà¯à®Ÿà¯à®•à¯‹à®³à¯ தோலà¯à®µà®¿à®¯à¯à®±à¯à®±à®¤à¯!" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 #: templates/login.php:20 diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po index c37d1daa06c..ea03b680f30 100644 --- a/l10n/ta_LK/files.po +++ b/l10n/ta_LK/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-23 02:02+0200\n" -"PO-Revision-Date: 2012-10-22 09:50+0000\n" +"POT-Creation-Date: 2012-11-06 00:00+0100\n" +"PO-Revision-Date: 2012-11-05 07:17+0000\n" "Last-Translator: suganthi <suganthi@nic.lk>\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" @@ -52,15 +52,15 @@ msgstr "வடà¯à®Ÿà®¿à®²à¯ எழà¯à®¤ à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ" msgid "Files" msgstr "கோபà¯à®ªà¯à®•à®³à¯" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "பகிரபà¯à®ªà®Ÿà®¾à®¤à®¤à¯" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "அழிகà¯à®•" -#: js/fileactions.js:182 +#: js/fileactions.js:172 msgid "Rename" msgstr "பெயரà¯à®®à®¾à®±à¯à®±à®®à¯" @@ -100,116 +100,116 @@ msgstr "பகிரபà¯à®ªà®Ÿà®¾à®¤à®¤à¯ {கோபà¯à®ªà¯à®•à®³à¯}" msgid "deleted {files}" msgstr "நீகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯ {கோபà¯à®ªà¯à®•à®³à¯}" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr " ZIP கோபà¯à®ªà¯ உரà¯à®µà®¾à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®•à®¿à®©à¯à®±à®¤à¯, இத௠சில நேரம௠ஆகலாமà¯." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "அடைவ௠அலà¯à®²à®¤à¯ 0 bytes ஠கொணà¯à®Ÿà¯à®³à¯à®³à®¤à®¾à®²à¯ உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ கோபà¯à®ªà¯ˆ பதிவேறà¯à®± à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "பதிவேறà¯à®±à®²à¯ வழà¯" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "நிலà¯à®µà¯ˆà®¯à®¿à®²à¯à®³à¯à®³" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "1 கோபà¯à®ªà¯ பதிவேறà¯à®±à®ªà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "{எணà¯à®£à®¿à®•à¯à®•à¯ˆ} கோபà¯à®ªà¯à®•à®³à¯ பதிவேறà¯à®±à®ªà¯à®ªà®Ÿà¯à®•à®¿à®©à¯à®±à®¤à¯" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "பதிவேறà¯à®±à®²à¯ இரதà¯à®¤à¯ செயà¯à®¯à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "கோபà¯à®ªà¯ பதிவேறà¯à®±à®®à¯ செயலà¯à®ªà®¾à®Ÿà¯à®Ÿà®¿à®²à¯ உளà¯à®³à®¤à¯. இநà¯à®¤à®ªà¯ பகà¯à®•à®¤à¯à®¤à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ வெறியேறà¯à®µà®¤à®¾à®©à®¤à¯ பதிவேறà¯à®±à®²à¯ˆ இரதà¯à®¤à¯ செயà¯à®¯à¯à®®à¯." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "செலà¯à®²à¯à®ªà®Ÿà®¿à®¯à®±à¯à®± பெயரà¯, '/ ' அனà¯à®®à®¤à®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà®®à®¾à®Ÿà¯à®Ÿà®¾à®¤à¯" -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "{எணà¯à®£à®¿à®•à¯à®•à¯ˆ} கோபà¯à®ªà¯à®•à®³à¯ வரà¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "வரà¯à®Ÿà¯à®®à¯ போதான வழà¯" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "பெயரà¯" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "அளவà¯" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "மாறà¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 கோபà¯à®ªà¯à®±à¯ˆ" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{எணà¯à®£à®¿à®•à¯à®•à¯ˆ} கோபà¯à®ªà¯à®±à¯ˆà®•à®³à¯" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 கோபà¯à®ªà¯" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{எணà¯à®£à®¿à®•à¯à®•à¯ˆ} கோபà¯à®ªà¯à®•à®³à¯" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "செகà¯à®•à®©à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "1 நிமிடதà¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯ " -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "{நிமிடஙà¯à®•à®³à¯} நிமிடஙà¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯ " -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "இனà¯à®±à¯" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "நேறà¯à®±à¯" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "{நாடà¯à®•à®³à¯} நாடà¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "கடநà¯à®¤ மாதமà¯" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "மாதஙà¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "கடநà¯à®¤ வரà¯à®Ÿà®®à¯" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "வரà¯à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯" @@ -241,7 +241,7 @@ msgstr "0 ஆனத௠எலà¯à®²à¯ˆà®¯à®±à¯à®±à®¤à¯" msgid "Maximum input size for ZIP files" msgstr "ZIP கோபà¯à®ªà¯à®•à®³à¯à®•à¯à®•à®¾à®© ஆககà¯à®•à¯‚டிய உளà¯à®³à¯€à®Ÿà¯à®Ÿà¯ அளவà¯" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "சேமிகà¯à®•" @@ -258,43 +258,43 @@ msgid "Folder" msgstr "கோபà¯à®ªà¯à®±à¯ˆ" #: templates/index.php:11 -msgid "From url" -msgstr "url இலிரà¯à®¨à¯à®¤à¯" +msgid "From link" +msgstr "இணைபà¯à®ªà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "பதிவேறà¯à®±à¯à®•" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "பதிவேறà¯à®±à®²à¯ˆ இரதà¯à®¤à¯ செயà¯à®•" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "இஙà¯à®•à¯ ஒனà¯à®±à¯à®®à¯ இலà¯à®²à¯ˆ. à®à®¤à®¾à®µà®¤à¯ பதிவேறà¯à®±à¯à®•!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "பகிரà¯à®µà¯" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "பதிவிறகà¯à®•à¯à®•" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "பதிவேறà¯à®±à®²à¯ மிகபà¯à®ªà¯†à®°à®¿à®¯à®¤à¯" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "நீஙà¯à®•à®³à¯ பதிவேறà¯à®± à®®à¯à®¯à®±à¯à®šà®¿à®•à¯à®•à¯à®®à¯ கோபà¯à®ªà¯à®•à®³à®¾à®©à®¤à¯ இநà¯à®¤ சேவையகதà¯à®¤à®¿à®²à¯ கோபà¯à®ªà¯ பதிவேறà¯à®±à®•à¯à®•à¯‚டிய ஆககà¯à®•à¯‚டிய அளவிலà¯à®®à¯ கூடியதà¯." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "கோபà¯à®ªà¯à®•à®³à¯ வரà¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®•à®¿à®©à¯à®±à®©, தயவà¯à®šà¯†à®¯à¯à®¤à¯ காதà¯à®¤à®¿à®°à¯à®™à¯à®•à®³à¯." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "தறà¯à®ªà¯‹à®¤à¯ வரà¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®ªà®µà¯ˆ" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 1bcb2a27c52..e544bb241e5 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-10-29 00:01+0100\n" +"POT-Creation-Date: 2012-11-06 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -29,27 +29,27 @@ msgstr "" msgid "This category already exists: " msgstr "" -#: js/js.js:243 templates/layout.user.php:53 templates/layout.user.php:54 +#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60 msgid "Settings" msgstr "" -#: js/oc-dialogs.js:123 +#: js/oc-dialogs.js:126 msgid "Choose" msgstr "" -#: js/oc-dialogs.js:143 js/oc-dialogs.js:163 +#: js/oc-dialogs.js:146 js/oc-dialogs.js:166 msgid "Cancel" msgstr "" -#: js/oc-dialogs.js:159 +#: js/oc-dialogs.js:162 msgid "No" msgstr "" -#: js/oc-dialogs.js:160 +#: js/oc-dialogs.js:163 msgid "Yes" msgstr "" -#: js/oc-dialogs.js:177 +#: js/oc-dialogs.js:180 msgid "Ok" msgstr "" @@ -314,87 +314,87 @@ msgstr "" msgid "Finish setup" msgstr "" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:15 templates/layout.user.php:16 msgid "Sunday" msgstr "" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:15 templates/layout.user.php:16 msgid "Monday" msgstr "" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:15 templates/layout.user.php:16 msgid "Tuesday" msgstr "" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:15 templates/layout.user.php:16 msgid "Wednesday" msgstr "" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:15 templates/layout.user.php:16 msgid "Thursday" msgstr "" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:15 templates/layout.user.php:16 msgid "Friday" msgstr "" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:15 templates/layout.user.php:16 msgid "Saturday" msgstr "" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "January" msgstr "" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "February" msgstr "" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "March" msgstr "" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "April" msgstr "" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "May" msgstr "" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "June" msgstr "" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "July" msgstr "" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "August" msgstr "" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "September" msgstr "" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "October" msgstr "" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "November" msgstr "" -#: templates/layout.guest.php:17 templates/layout.user.php:18 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "December" msgstr "" -#: templates/layout.guest.php:42 +#: templates/layout.guest.php:41 msgid "web services under your control" msgstr "" -#: templates/layout.user.php:38 +#: templates/layout.user.php:44 msgid "Log out" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 4b88f5b4d77..341c2385dad 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-10-29 00:01+0100\n" +"POT-Creation-Date: 2012-11-06 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -51,15 +51,15 @@ msgstr "" msgid "Files" msgstr "" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "" -#: js/fileactions.js:178 +#: js/fileactions.js:172 msgid "Rename" msgstr "" @@ -144,15 +144,15 @@ msgstr "" msgid "error while scanning" msgstr "" -#: js/files.js:754 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "" -#: js/files.js:755 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "" -#: js/files.js:756 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "" @@ -240,7 +240,7 @@ msgstr "" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "" @@ -257,43 +257,43 @@ msgid "Folder" msgstr "" #: templates/index.php:11 -msgid "From url" +msgid "From link" msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 605fb384e73..fefa732f644 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-10-29 00:01+0100\n" +"POT-Creation-Date: 2012-11-06 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 8037770ae04..7e6a979f41c 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-10-29 00:01+0100\n" +"POT-Creation-Date: 2012-11-06 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index d0d2d9a05eb..614ccb4f512 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-10-29 00:01+0100\n" +"POT-Creation-Date: 2012-11-06 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index d8125728bed..f06612c7db7 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-10-29 00:01+0100\n" +"POT-Creation-Date: 2012-11-06 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 51f2bd64467..12b6558b8cd 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-10-29 00:01+0100\n" +"POT-Creation-Date: 2012-11-06 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 192811c94d1..f7acfeb4c35 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-10-29 00:01+0100\n" +"POT-Creation-Date: 2012-11-06 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -210,15 +210,15 @@ msgstr "" msgid "Ask a question" msgstr "" -#: templates/help.php:23 +#: templates/help.php:22 msgid "Problems connecting to help database." msgstr "" -#: templates/help.php:24 +#: templates/help.php:23 msgid "Go there manually." msgstr "" -#: templates/help.php:32 +#: templates/help.php:31 msgid "Answer" msgstr "" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index cd939ee0a32..e3f953d9c60 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-10-29 00:01+0100\n" +"POT-Creation-Date: 2012-11-06 00:00+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po index 21882504f2a..24619bfb1d2 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-10-29 00:01+0100\n" -"PO-Revision-Date: 2012-10-28 15:51+0000\n" -"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" +"Last-Translator: I Robot <thomas.mueller@tmit.eu>\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" @@ -53,11 +53,11 @@ msgstr "เขียนข้à¸à¸¡à¸¹à¸¥à¸¥à¸‡à¹à¸œà¹ˆà¸™à¸”ิสà¸à¹Œà¸¥à¹‰ msgid "Files" msgstr "ไฟล์" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "ยà¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "ลบ" @@ -146,15 +146,15 @@ msgstr "สà¹à¸à¸™à¹„ฟล์à¹à¸¥à¹‰à¸§ {count} ไฟล์" msgid "error while scanning" msgstr "พบข้à¸à¸œà¸´à¸”พลาดในระหว่างà¸à¸²à¸£à¸ªà¹à¸à¸™à¹„ฟล์" -#: js/files.js:754 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "ชื่à¸" -#: js/files.js:755 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "ขนาด" -#: js/files.js:756 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "ปรับปรุงล่าสุด" @@ -242,7 +242,7 @@ msgstr "0 หมายถึงไม่จำà¸à¸±à¸”" msgid "Maximum input size for ZIP files" msgstr "ขนาดไฟล์ ZIP สูงสุด" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "บันทึà¸" @@ -259,43 +259,43 @@ msgid "Folder" msgstr "à¹à¸Ÿà¹‰à¸¡à¹€à¸à¸à¸ªà¸²à¸£" #: templates/index.php:11 -msgid "From url" -msgstr "จาภurl" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "à¸à¸±à¸žà¹‚หลด" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "ยà¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¸à¸±à¸žà¹‚หลด" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "ยังไม่มีไฟล์ใดๆà¸à¸¢à¸¹à¹ˆà¸—ี่นี่ à¸à¸£à¸¸à¸“าà¸à¸±à¸žà¹‚หลดไฟล์!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "à¹à¸Šà¸£à¹Œ" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "ดาวน์โหลด" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "ไฟล์ที่à¸à¸±à¸žà¹‚หลดมีขนาดใหà¸à¹ˆà¹€à¸à¸´à¸™à¹„ป" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "ไฟล์ที่คุณพยายามที่จะà¸à¸±à¸žà¹‚หลดมีขนาดเà¸à¸´à¸™à¸à¸§à¹ˆà¸²à¸‚นาดสูงสุดที่à¸à¸³à¸«à¸™à¸”ไว้ให้à¸à¸±à¸žà¹‚หลดได้สำหรับเซิร์ฟเวà¸à¸£à¹Œà¸™à¸µà¹‰" -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "ไฟล์à¸à¸³à¸¥à¸±à¸‡à¸à¸¢à¸¹à¹ˆà¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸à¸²à¸£à¸ªà¹à¸à¸™, à¸à¸£à¸¸à¸“ารà¸à¸ªà¸±à¸à¸„รู่." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "ไฟล์ที่à¸à¸³à¸¥à¸±à¸‡à¸ªà¹à¸à¸™à¸à¸¢à¸¹à¹ˆà¸‚ณะนี้" diff --git a/l10n/tr/files.po b/l10n/tr/files.po index 390e74001c5..5744ead1939 100644 --- a/l10n/tr/files.po +++ b/l10n/tr/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" @@ -55,17 +55,17 @@ msgstr "Diske yazılamadı" msgid "Files" msgstr "Dosyalar" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" -msgstr "" +msgstr "Paylaşılmayan" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Sil" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" -msgstr "" +msgstr "Ä°sim deÄŸiÅŸtir." #: js/filelist.js:194 js/filelist.js:196 msgid "{new_name} already exists" @@ -103,116 +103,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "ZIP dosyası oluÅŸturuluyor, biraz sürebilir." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Dosyanızın boyutu 0 byte olduÄŸundan veya bir dizin olduÄŸundan yüklenemedi" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Yükleme hatası" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Bekliyor" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Yükleme iptal edildi." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Dosya yükleme iÅŸlemi sürüyor. Åžimdi sayfadan ayrılırsanız iÅŸleminiz iptal olur." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Geçersiz isim, '/' iÅŸaretine izin verilmiyor." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Ad" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Boyut" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "DeÄŸiÅŸtirilme" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "" @@ -244,9 +244,9 @@ msgstr "0 limitsiz demektir" msgid "Maximum input size for ZIP files" msgstr "ZIP dosyaları için en fazla girdi sayısı" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Kaydet" #: templates/index.php:7 msgid "New" @@ -261,43 +261,43 @@ msgid "Folder" msgstr "Klasör" #: templates/index.php:11 -msgid "From url" -msgstr "Url'den" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Yükle" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Yüklemeyi iptal et" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Burada hiçbir ÅŸey yok. BirÅŸeyler yükleyin!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "PaylaÅŸ" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Ä°ndir" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Yüklemeniz çok büyük" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Dosyalar taranıyor, lütfen bekleyin." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Güncel tarama" diff --git a/l10n/uk/files.po b/l10n/uk/files.po index 311c3f7a09f..6f1a92f33f6 100644 --- a/l10n/uk/files.po +++ b/l10n/uk/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -53,15 +53,15 @@ msgstr "" msgid "Files" msgstr "Файли" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" -msgstr "" +msgstr "Заборонити доÑтуп" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Видалити" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "" @@ -101,118 +101,118 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ZIP-файлу, це може зайнÑти певний чаÑ." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Ðеможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Помилка завантаженнÑ" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "ОчікуваннÑ" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÑ€Ð²Ð°Ð½Ð¾." -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Ðекоректне ім'Ñ, '/' не дозволено." -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Ім'Ñ" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "Розмір" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Змінено" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" -msgstr "" +msgstr "Ñекунди тому" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "1 хвилину тому" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" -msgstr "" +msgstr "Ñьогодні" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" -msgstr "" +msgstr "вчора" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" -msgstr "" +msgstr "минулого міÑÑцÑ" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" -msgstr "" +msgstr "міÑÑці тому" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" -msgstr "" +msgstr "минулого року" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" -msgstr "" +msgstr "роки тому" #: templates/admin.php:5 msgid "File handling" @@ -242,9 +242,9 @@ msgstr "0 Ñ” безліміт" msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "Зберегти" #: templates/index.php:7 msgid "New" @@ -259,43 +259,43 @@ msgid "Folder" msgstr "Папка" #: templates/index.php:11 -msgid "From url" -msgstr "З URL" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Відвантажити" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Перервати завантаженнÑ" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Тут нічого немає. Відвантажте що-небудь!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "ПоділитиÑÑ" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Завантажити" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "Файл занадто великий" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Файли,що ви намагаєтеÑÑŒ відвантажити перевищують макÑимальний дозволений розмір файлів на цьому Ñервері." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Файли ÑкануютьÑÑ, зачекайте, будь-лаÑка." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Поточне ÑкануваннÑ" diff --git a/l10n/vi/files.po b/l10n/vi/files.po index 0e8f88901fc..24a6c71c50b 100644 --- a/l10n/vi/files.po +++ b/l10n/vi/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-10-27 00:01+0200\n" -"PO-Revision-Date: 2012-10-26 13:31+0000\n" -"Last-Translator: mattheu_9x <mattheu_9x@yahoo.com>\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" +"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -54,15 +54,15 @@ msgstr "Không thể ghi và o Ä‘Ä©a cứng" msgid "Files" msgstr "Táºp tin" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "Không chia sẽ" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "Xóa" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "Sá»a tên" @@ -102,116 +102,116 @@ msgstr "hủy chia sẽ {files}" msgid "deleted {files}" msgstr "đã xóa {files}" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "Tạo táºp tinh ZIP, Ä‘iá»u nà y có thể mất má»™t Ãt thá»i gian" -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Không thể tải lên táºp tin nà y do nó là má»™t thÆ° mục hoặc kÃch thÆ°á»›c táºp tin bằng 0 byte" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "Tải lên lá»—i" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Chá»" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "1 tệp tin Ä‘ang được tải lên" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "{count} táºp tin Ä‘ang tải lên" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "Hủy tải lên" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Táºp tin tải lên Ä‘ang được xá» lý. Nếu bạn rá»i khá»i trang bây giá» sẽ hủy quá trình nà y." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "Tên không hợp lệ ,không được phép dùng '/'" -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "{count} táºp tin đã được quét" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "lá»—i trong khi quét" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "Tên" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "KÃch cỡ" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "Thay đổi" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1 thÆ° mục" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{count} thÆ° mục" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 táºp tin" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{count} táºp tin" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "giây trÆ°á»›c" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "1 phút trÆ°á»›c" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "{minutes} phút trÆ°á»›c" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "hôm nay" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "hôm qua" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "{days} ngà y trÆ°á»›c" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "tháng trÆ°á»›c" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "tháng trÆ°á»›c" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "năm trÆ°á»›c" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "năm trÆ°á»›c" @@ -243,7 +243,7 @@ msgstr "0 là không giá»›i hạn" msgid "Maximum input size for ZIP files" msgstr "KÃch thÆ°á»›c tối Ä‘a cho các táºp tin ZIP" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "LÆ°u" @@ -260,43 +260,43 @@ msgid "Folder" msgstr "Folder" #: templates/index.php:11 -msgid "From url" -msgstr "Từ url" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "Tải lên" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "Hủy upload" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "Không có gì ở đây .Hãy tải lên má»™t cái gì đó !" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "Chia sẻ" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "Tải xuống" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "File tải lên quá lá»›n" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Các táºp tin bạn Ä‘ang cố gắng tải lên vượt quá kÃch thÆ°á»›c tối Ä‘a cho phép trên máy chủ nà y." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "Táºp tin Ä‘ang được quét ,vui lòng chá»." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "Hiện tại Ä‘ang quét" diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po index 82cd1c6f422..a2aa788e898 100644 --- a/l10n/zh_CN.GB2312/files.po +++ b/l10n/zh_CN.GB2312/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n" "MIME-Version: 1.0\n" @@ -53,15 +53,15 @@ msgstr "写ç£ç›˜å¤±è´¥" msgid "Files" msgstr "文件" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "å–消共享" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "åˆ é™¤" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "é‡å‘½å" @@ -101,116 +101,116 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "æ£åœ¨ç”ŸæˆZIP文件,è¿™å¯èƒ½éœ€è¦ç‚¹æ—¶é—´" -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "ä¸èƒ½ä¸Šä¼ ä½ æŒ‡å®šçš„æ–‡ä»¶,å¯èƒ½å› 为它是个文件夹或者大å°ä¸º0" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "ä¸Šä¼ é”™è¯¯" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "Pending" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "1 个文件æ£åœ¨ä¸Šä¼ " -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "ä¸Šä¼ å–消了" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "文件æ£åœ¨ä¸Šä¼ 。关é—页é¢ä¼šå–æ¶ˆä¸Šä¼ ã€‚" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "éžæ³•æ–‡ä»¶å,\"/\"是ä¸è¢«è®¸å¯çš„" -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "扫æ出错" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "åå—" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "大å°" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "修改日期" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "秒å‰" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "1 分钟å‰" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "今天" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "昨天" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "上个月" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "月å‰" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "去年" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "å¹´å‰" @@ -242,7 +242,7 @@ msgstr "0æ˜¯æ— é™çš„" msgid "Maximum input size for ZIP files" msgstr "最大的ZIP文件输入大å°" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "ä¿å˜" @@ -259,43 +259,43 @@ msgid "Folder" msgstr "文件夹" #: templates/index.php:11 -msgid "From url" -msgstr "从URL:" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "ä¸Šä¼ " -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "å–æ¶ˆä¸Šä¼ " -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "这里没有东西.ä¸Šä¼ ç‚¹ä»€ä¹ˆ!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "分享" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "下载" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "ä¸Šä¼ çš„æ–‡ä»¶å¤ªå¤§äº†" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "ä½ æ£åœ¨è¯•å›¾ä¸Šä¼ 的文件超过了æ¤æœåŠ¡å™¨æ”¯æŒçš„最大的文件大å°." -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "æ£åœ¨æ‰«æ文件,请ç¨å€™." -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "æ£åœ¨æ‰«æ" diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po index 69506f7a4e9..7d7a5fcbd84 100644 --- a/l10n/zh_CN/files.po +++ b/l10n/zh_CN/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-10-26 02:02+0200\n" -"PO-Revision-Date: 2012-10-25 03:45+0000\n" -"Last-Translator: hanfeng <appweb.cn@gmail.com>\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" +"Last-Translator: I Robot <thomas.mueller@tmit.eu>\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" @@ -55,15 +55,15 @@ msgstr "写入ç£ç›˜å¤±è´¥" msgid "Files" msgstr "文件" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" msgstr "å–消分享" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "åˆ é™¤" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" msgstr "é‡å‘½å" @@ -103,116 +103,116 @@ msgstr "å–消了共享 {files}" msgid "deleted {files}" msgstr "åˆ é™¤äº† {files}" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "æ£åœ¨ç”Ÿæˆ ZIP 文件，å¯èƒ½éœ€è¦ä¸€äº›æ—¶é—´" -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "æ— æ³•ä¸Šä¼ æ–‡ä»¶ï¼Œå› ä¸ºå®ƒæ˜¯ä¸€ä¸ªç›®å½•æˆ–è€…å¤§å°ä¸º 0 å—节" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "ä¸Šä¼ é”™è¯¯" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "æ“作ç‰å¾…ä¸" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "1ä¸ªæ–‡ä»¶ä¸Šä¼ ä¸" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "{count} ä¸ªæ–‡ä»¶ä¸Šä¼ ä¸" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "ä¸Šä¼ å·²å–消" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "文件æ£åœ¨ä¸Šä¼ ä¸ã€‚现在离开æ¤é¡µä¼šå¯¼è‡´ä¸Šä¼ 动作被å–消。" -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "éžæ³•çš„å称，ä¸å…许使用‘/’。" -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "{count} 个文件已扫æ。" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "扫æ时出错" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "å称" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "大å°" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "修改日期" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "1个文件夹" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "{count} 个文件夹" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "1 个文件" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "{count} 个文件" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" msgstr "秒å‰" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" msgstr "一分钟å‰" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "{minutes} 分钟å‰" -#: js/files.js:851 +#: js/files.js:843 msgid "today" msgstr "今天" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" msgstr "昨天" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "{days} 天å‰" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" msgstr "上月" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" msgstr "月å‰" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" msgstr "去年" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" msgstr "å¹´å‰" @@ -244,7 +244,7 @@ msgstr "0 ä¸ºæ— é™åˆ¶" msgid "Maximum input size for ZIP files" msgstr "ZIP 文件的最大输入大å°" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" msgstr "ä¿å˜" @@ -261,43 +261,43 @@ msgid "Folder" msgstr "文件夹" #: templates/index.php:11 -msgid "From url" -msgstr "æ¥è‡ªåœ°å€" +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "ä¸Šä¼ " -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "å–æ¶ˆä¸Šä¼ " -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "è¿™é‡Œè¿˜ä»€ä¹ˆéƒ½æ²¡æœ‰ã€‚ä¸Šä¼ äº›ä¸œè¥¿å§ï¼" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "共享" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "下载" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "ä¸Šä¼ æ–‡ä»¶è¿‡å¤§" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "您æ£å°è¯•ä¸Šä¼ 的文件超过了æ¤æœåŠ¡å™¨å¯ä»¥ä¸Šä¼ 的最大容é‡é™åˆ¶" -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "文件æ£åœ¨è¢«æ‰«æ，请ç¨å€™ã€‚" -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "当å‰æ‰«æ" diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po index 3c0c8735b3f..52c48f40621 100644 --- a/l10n/zh_TW/files.po +++ b/l10n/zh_TW/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-19 02:03+0200\n" -"PO-Revision-Date: 2012-10-19 00:04+0000\n" +"POT-Creation-Date: 2012-11-03 00:00+0100\n" +"PO-Revision-Date: 2012-11-01 23:21+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -54,17 +54,17 @@ msgstr "寫入硬碟失敗" msgid "Files" msgstr "檔案" -#: js/fileactions.js:108 templates/index.php:62 +#: js/fileactions.js:108 templates/index.php:64 msgid "Unshare" -msgstr "" +msgstr "å–消共享" -#: js/fileactions.js:110 templates/index.php:64 +#: js/fileactions.js:110 templates/index.php:66 msgid "Delete" msgstr "刪除" -#: js/fileactions.js:182 +#: js/fileactions.js:178 msgid "Rename" -msgstr "" +msgstr "é‡æ–°å‘½å" #: js/filelist.js:194 js/filelist.js:196 msgid "{new_name} already exists" @@ -102,118 +102,118 @@ msgstr "" msgid "deleted {files}" msgstr "" -#: js/files.js:179 +#: js/files.js:171 msgid "generating ZIP-file, it may take some time." msgstr "產生壓縮檔, 它å¯èƒ½éœ€è¦ä¸€æ®µæ™‚é–“." -#: js/files.js:214 +#: js/files.js:206 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "ç„¡æ³•ä¸Šå‚³æ‚¨çš„æª”æ¡ˆå› ç‚ºå®ƒå¯èƒ½æ˜¯ä¸€å€‹ç›®éŒ„或檔案大å°ç‚º0" -#: js/files.js:214 +#: js/files.js:206 msgid "Upload Error" msgstr "上傳發生錯誤" -#: js/files.js:242 js/files.js:347 js/files.js:377 +#: js/files.js:234 js/files.js:339 js/files.js:369 msgid "Pending" msgstr "" -#: js/files.js:262 +#: js/files.js:254 msgid "1 file uploading" msgstr "" -#: js/files.js:265 js/files.js:310 js/files.js:325 +#: js/files.js:257 js/files.js:302 js/files.js:317 msgid "{count} files uploading" msgstr "" -#: js/files.js:328 js/files.js:361 +#: js/files.js:320 js/files.js:353 msgid "Upload cancelled." msgstr "上傳å–消" -#: js/files.js:430 +#: js/files.js:422 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "檔案上傳ä¸. 離開æ¤é é¢å°‡æœƒå–消上傳." -#: js/files.js:500 +#: js/files.js:492 msgid "Invalid name, '/' is not allowed." msgstr "無效的å稱, '/'是ä¸è¢«å…許的" -#: js/files.js:681 +#: js/files.js:673 msgid "{count} files scanned" msgstr "" -#: js/files.js:689 +#: js/files.js:681 msgid "error while scanning" msgstr "" -#: js/files.js:762 templates/index.php:48 +#: js/files.js:754 templates/index.php:50 msgid "Name" msgstr "å稱" -#: js/files.js:763 templates/index.php:56 +#: js/files.js:755 templates/index.php:58 msgid "Size" msgstr "大å°" -#: js/files.js:764 templates/index.php:58 +#: js/files.js:756 templates/index.php:60 msgid "Modified" msgstr "修改" -#: js/files.js:791 +#: js/files.js:783 msgid "1 folder" msgstr "" -#: js/files.js:793 +#: js/files.js:785 msgid "{count} folders" msgstr "" -#: js/files.js:801 +#: js/files.js:793 msgid "1 file" msgstr "" -#: js/files.js:803 +#: js/files.js:795 msgid "{count} files" msgstr "" -#: js/files.js:846 +#: js/files.js:838 msgid "seconds ago" -msgstr "" +msgstr "幾秒å‰" -#: js/files.js:847 +#: js/files.js:839 msgid "1 minute ago" -msgstr "" +msgstr "1 分é˜å‰" -#: js/files.js:848 +#: js/files.js:840 msgid "{minutes} minutes ago" msgstr "" -#: js/files.js:851 +#: js/files.js:843 msgid "today" -msgstr "" +msgstr "今天" -#: js/files.js:852 +#: js/files.js:844 msgid "yesterday" -msgstr "" +msgstr "昨天" -#: js/files.js:853 +#: js/files.js:845 msgid "{days} days ago" msgstr "" -#: js/files.js:854 +#: js/files.js:846 msgid "last month" -msgstr "" +msgstr "上個月" -#: js/files.js:856 +#: js/files.js:848 msgid "months ago" -msgstr "" +msgstr "幾個月å‰" -#: js/files.js:857 +#: js/files.js:849 msgid "last year" -msgstr "" +msgstr "去年" -#: js/files.js:858 +#: js/files.js:850 msgid "years ago" -msgstr "" +msgstr "幾年å‰" #: templates/admin.php:5 msgid "File handling" @@ -243,9 +243,9 @@ msgstr "0代表沒有é™åˆ¶" msgid "Maximum input size for ZIP files" msgstr "é‡å°ZIP檔案最大輸入大å°" -#: templates/admin.php:14 +#: templates/admin.php:15 msgid "Save" -msgstr "" +msgstr "儲å˜" #: templates/index.php:7 msgid "New" @@ -260,43 +260,43 @@ msgid "Folder" msgstr "資料夾" #: templates/index.php:11 -msgid "From url" -msgstr "ç”± url " +msgid "From link" +msgstr "" -#: templates/index.php:20 +#: templates/index.php:22 msgid "Upload" msgstr "上傳" -#: templates/index.php:27 +#: templates/index.php:29 msgid "Cancel upload" msgstr "å–消上傳" -#: templates/index.php:40 +#: templates/index.php:42 msgid "Nothing in here. Upload something!" msgstr "沒有任何æ±è¥¿ã€‚請上傳內容!" -#: templates/index.php:50 +#: templates/index.php:52 msgid "Share" msgstr "分享" -#: templates/index.php:52 +#: templates/index.php:54 msgid "Download" msgstr "下載" -#: templates/index.php:75 +#: templates/index.php:77 msgid "Upload too large" msgstr "上傳éŽå¤§" -#: templates/index.php:77 +#: templates/index.php:79 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "ä½ è©¦åœ–ä¸Šå‚³çš„æª”æ¡ˆå·²è¶…éŽä¼ºæœå™¨çš„最大容é‡é™åˆ¶ã€‚　" -#: templates/index.php:82 +#: templates/index.php:84 msgid "Files are being scanned, please wait." msgstr "æ£åœ¨æŽƒæ檔案，請ç¨ç‰ã€‚" -#: templates/index.php:85 +#: templates/index.php:87 msgid "Current scanning" msgstr "ç›®å‰æŽƒæ" diff --git a/l10n/zu_ZA/core.po b/l10n/zu_ZA/core.po new file mode 100644 index 00000000000..956f0f5d845 --- /dev/null +++ b/l10n/zu_ZA/core.po @@ -0,0 +1,451 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-11-06 00:00+0100\n" +"PO-Revision-Date: 2011-07-25 16:05+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zu_ZA\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/vcategories/add.php:22 ajax/vcategories/delete.php:22 +msgid "Application name not provided." +msgstr "" + +#: ajax/vcategories/add.php:28 +msgid "No category to add?" +msgstr "" + +#: ajax/vcategories/add.php:35 +msgid "This category already exists: " +msgstr "" + +#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60 +msgid "Settings" +msgstr "" + +#: js/oc-dialogs.js:126 +msgid "Choose" +msgstr "" + +#: js/oc-dialogs.js:146 js/oc-dialogs.js:166 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:162 +msgid "No" +msgstr "" + +#: js/oc-dialogs.js:163 +msgid "Yes" +msgstr "" + +#: js/oc-dialogs.js:180 +msgid "Ok" +msgstr "" + +#: js/oc-vcategories.js:68 +msgid "No categories selected for deletion." +msgstr "" + +#: js/oc-vcategories.js:68 js/share.js:135 js/share.js:142 js/share.js:525 +#: js/share.js:537 +msgid "Error" +msgstr "" + +#: js/share.js:124 +msgid "Error while sharing" +msgstr "" + +#: js/share.js:135 +msgid "Error while unsharing" +msgstr "" + +#: js/share.js:142 +msgid "Error while changing permissions" +msgstr "" + +#: js/share.js:151 +msgid "Shared with you and the group {group} by {owner}" +msgstr "" + +#: js/share.js:153 +msgid "Shared with you by {owner}" +msgstr "" + +#: js/share.js:158 +msgid "Share with" +msgstr "" + +#: js/share.js:163 +msgid "Share with link" +msgstr "" + +#: js/share.js:164 +msgid "Password protect" +msgstr "" + +#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: templates/verify.php:13 +msgid "Password" +msgstr "" + +#: js/share.js:173 +msgid "Set expiration date" +msgstr "" + +#: js/share.js:174 +msgid "Expiration date" +msgstr "" + +#: js/share.js:206 +msgid "Share via email:" +msgstr "" + +#: js/share.js:208 +msgid "No people found" +msgstr "" + +#: js/share.js:235 +msgid "Resharing is not allowed" +msgstr "" + +#: js/share.js:271 +msgid "Shared in {item} with {user}" +msgstr "" + +#: js/share.js:292 +msgid "Unshare" +msgstr "" + +#: js/share.js:304 +msgid "can edit" +msgstr "" + +#: js/share.js:306 +msgid "access control" +msgstr "" + +#: js/share.js:309 +msgid "create" +msgstr "" + +#: js/share.js:312 +msgid "update" +msgstr "" + +#: js/share.js:315 +msgid "delete" +msgstr "" + +#: js/share.js:318 +msgid "share" +msgstr "" + +#: js/share.js:343 js/share.js:512 js/share.js:514 +msgid "Password protected" +msgstr "" + +#: js/share.js:525 +msgid "Error unsetting expiration date" +msgstr "" + +#: js/share.js:537 +msgid "Error setting expiration date" +msgstr "" + +#: lostpassword/controller.php:47 +msgid "ownCloud password reset" +msgstr "" + +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "" + +#: lostpassword/templates/lostpassword.php:3 +msgid "You will receive a link to reset your password via Email." +msgstr "" + +#: lostpassword/templates/lostpassword.php:5 +msgid "Reset email send." +msgstr "" + +#: lostpassword/templates/lostpassword.php:8 +msgid "Request failed!" +msgstr "" + +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 +#: templates/login.php:20 +msgid "Username" +msgstr "" + +#: lostpassword/templates/lostpassword.php:14 +msgid "Request reset" +msgstr "" + +#: lostpassword/templates/resetpassword.php:4 +msgid "Your password was reset" +msgstr "" + +#: lostpassword/templates/resetpassword.php:5 +msgid "To login page" +msgstr "" + +#: lostpassword/templates/resetpassword.php:8 +msgid "New password" +msgstr "" + +#: lostpassword/templates/resetpassword.php:11 +msgid "Reset password" +msgstr "" + +#: strings.php:5 +msgid "Personal" +msgstr "" + +#: strings.php:6 +msgid "Users" +msgstr "" + +#: strings.php:7 +msgid "Apps" +msgstr "" + +#: strings.php:8 +msgid "Admin" +msgstr "" + +#: strings.php:9 +msgid "Help" +msgstr "" + +#: templates/403.php:12 +msgid "Access forbidden" +msgstr "" + +#: templates/404.php:12 +msgid "Cloud not found" +msgstr "" + +#: templates/edit_categories_dialog.php:4 +msgid "Edit categories" +msgstr "" + +#: templates/edit_categories_dialog.php:14 +msgid "Add" +msgstr "" + +#: templates/installation.php:23 templates/installation.php:31 +msgid "Security Warning" +msgstr "" + +#: templates/installation.php:24 +msgid "" +"No secure random number generator is available, please enable the PHP " +"OpenSSL extension." +msgstr "" + +#: templates/installation.php:26 +msgid "" +"Without a secure random number generator an attacker may be able to predict " +"password reset tokens and take over your account." +msgstr "" + +#: templates/installation.php:32 +msgid "" +"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." +msgstr "" + +#: templates/installation.php:36 +msgid "Create an <strong>admin account</strong>" +msgstr "" + +#: templates/installation.php:48 +msgid "Advanced" +msgstr "" + +#: templates/installation.php:50 +msgid "Data folder" +msgstr "" + +#: templates/installation.php:57 +msgid "Configure the database" +msgstr "" + +#: templates/installation.php:62 templates/installation.php:73 +#: templates/installation.php:83 templates/installation.php:93 +msgid "will be used" +msgstr "" + +#: templates/installation.php:105 +msgid "Database user" +msgstr "" + +#: templates/installation.php:109 +msgid "Database password" +msgstr "" + +#: templates/installation.php:113 +msgid "Database name" +msgstr "" + +#: templates/installation.php:121 +msgid "Database tablespace" +msgstr "" + +#: templates/installation.php:127 +msgid "Database host" +msgstr "" + +#: templates/installation.php:132 +msgid "Finish setup" +msgstr "" + +#: templates/layout.guest.php:15 templates/layout.user.php:16 +msgid "Sunday" +msgstr "" + +#: templates/layout.guest.php:15 templates/layout.user.php:16 +msgid "Monday" +msgstr "" + +#: templates/layout.guest.php:15 templates/layout.user.php:16 +msgid "Tuesday" +msgstr "" + +#: templates/layout.guest.php:15 templates/layout.user.php:16 +msgid "Wednesday" +msgstr "" + +#: templates/layout.guest.php:15 templates/layout.user.php:16 +msgid "Thursday" +msgstr "" + +#: templates/layout.guest.php:15 templates/layout.user.php:16 +msgid "Friday" +msgstr "" + +#: templates/layout.guest.php:15 templates/layout.user.php:16 +msgid "Saturday" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "January" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "February" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "March" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "April" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "May" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "June" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "July" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "August" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "September" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "October" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "November" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "December" +msgstr "" + +#: templates/layout.guest.php:41 +msgid "web services under your control" +msgstr "" + +#: templates/layout.user.php:44 +msgid "Log out" +msgstr "" + +#: templates/login.php:8 +msgid "Automatic logon rejected!" +msgstr "" + +#: templates/login.php:9 +msgid "" +"If you did not change your password recently, your account may be " +"compromised!" +msgstr "" + +#: templates/login.php:10 +msgid "Please change your password to secure your account again." +msgstr "" + +#: templates/login.php:15 +msgid "Lost your password?" +msgstr "" + +#: templates/login.php:27 +msgid "remember" +msgstr "" + +#: templates/login.php:28 +msgid "Log in" +msgstr "" + +#: templates/logout.php:1 +msgid "You are logged out." +msgstr "" + +#: templates/part.pagenavi.php:3 +msgid "prev" +msgstr "" + +#: templates/part.pagenavi.php:20 +msgid "next" +msgstr "" + +#: templates/verify.php:5 +msgid "Security Warning!" +msgstr "" + +#: templates/verify.php:6 +msgid "" +"Please verify your password. <br/>For security reasons you may be " +"occasionally asked to enter your password again." +msgstr "" + +#: templates/verify.php:16 +msgid "Verify" +msgstr "" diff --git a/l10n/zu_ZA/files.po b/l10n/zu_ZA/files.po new file mode 100644 index 00000000000..19f84d9ed96 --- /dev/null +++ b/l10n/zu_ZA/files.po @@ -0,0 +1,299 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-11-06 00:00+0100\n" +"PO-Revision-Date: 2011-08-13 02:19+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zu_ZA\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/upload.php:20 +msgid "There is no error, the file uploaded with success" +msgstr "" + +#: ajax/upload.php:21 +msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini" +msgstr "" + +#: ajax/upload.php:22 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form" +msgstr "" + +#: ajax/upload.php:23 +msgid "The uploaded file was only partially uploaded" +msgstr "" + +#: ajax/upload.php:24 +msgid "No file was uploaded" +msgstr "" + +#: ajax/upload.php:25 +msgid "Missing a temporary folder" +msgstr "" + +#: ajax/upload.php:26 +msgid "Failed to write to disk" +msgstr "" + +#: appinfo/app.php:6 +msgid "Files" +msgstr "" + +#: js/fileactions.js:108 templates/index.php:64 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:66 +msgid "Delete" +msgstr "" + +#: js/fileactions.js:172 +msgid "Rename" +msgstr "" + +#: js/filelist.js:194 js/filelist.js:196 +msgid "{new_name} already exists" +msgstr "" + +#: js/filelist.js:194 js/filelist.js:196 +msgid "replace" +msgstr "" + +#: js/filelist.js:194 +msgid "suggest name" +msgstr "" + +#: js/filelist.js:194 js/filelist.js:196 +msgid "cancel" +msgstr "" + +#: js/filelist.js:243 +msgid "replaced {new_name}" +msgstr "" + +#: js/filelist.js:243 js/filelist.js:245 js/filelist.js:277 js/filelist.js:279 +msgid "undo" +msgstr "" + +#: js/filelist.js:245 +msgid "replaced {new_name} with {old_name}" +msgstr "" + +#: js/filelist.js:277 +msgid "unshared {files}" +msgstr "" + +#: js/filelist.js:279 +msgid "deleted {files}" +msgstr "" + +#: js/files.js:171 +msgid "generating ZIP-file, it may take some time." +msgstr "" + +#: js/files.js:206 +msgid "Unable to upload your file as it is a directory or has 0 bytes" +msgstr "" + +#: js/files.js:206 +msgid "Upload Error" +msgstr "" + +#: js/files.js:234 js/files.js:339 js/files.js:369 +msgid "Pending" +msgstr "" + +#: js/files.js:254 +msgid "1 file uploading" +msgstr "" + +#: js/files.js:257 js/files.js:302 js/files.js:317 +msgid "{count} files uploading" +msgstr "" + +#: js/files.js:320 js/files.js:353 +msgid "Upload cancelled." +msgstr "" + +#: js/files.js:422 +msgid "" +"File upload is in progress. Leaving the page now will cancel the upload." +msgstr "" + +#: js/files.js:492 +msgid "Invalid name, '/' is not allowed." +msgstr "" + +#: js/files.js:673 +msgid "{count} files scanned" +msgstr "" + +#: js/files.js:681 +msgid "error while scanning" +msgstr "" + +#: js/files.js:754 templates/index.php:50 +msgid "Name" +msgstr "" + +#: js/files.js:755 templates/index.php:58 +msgid "Size" +msgstr "" + +#: js/files.js:756 templates/index.php:60 +msgid "Modified" +msgstr "" + +#: js/files.js:783 +msgid "1 folder" +msgstr "" + +#: js/files.js:785 +msgid "{count} folders" +msgstr "" + +#: js/files.js:793 +msgid "1 file" +msgstr "" + +#: js/files.js:795 +msgid "{count} files" +msgstr "" + +#: js/files.js:838 +msgid "seconds ago" +msgstr "" + +#: js/files.js:839 +msgid "1 minute ago" +msgstr "" + +#: js/files.js:840 +msgid "{minutes} minutes ago" +msgstr "" + +#: js/files.js:843 +msgid "today" +msgstr "" + +#: js/files.js:844 +msgid "yesterday" +msgstr "" + +#: js/files.js:845 +msgid "{days} days ago" +msgstr "" + +#: js/files.js:846 +msgid "last month" +msgstr "" + +#: js/files.js:848 +msgid "months ago" +msgstr "" + +#: js/files.js:849 +msgid "last year" +msgstr "" + +#: js/files.js:850 +msgid "years ago" +msgstr "" + +#: templates/admin.php:5 +msgid "File handling" +msgstr "" + +#: templates/admin.php:7 +msgid "Maximum upload size" +msgstr "" + +#: templates/admin.php:7 +msgid "max. possible: " +msgstr "" + +#: templates/admin.php:9 +msgid "Needed for multi-file and folder downloads." +msgstr "" + +#: templates/admin.php:9 +msgid "Enable ZIP-download" +msgstr "" + +#: templates/admin.php:11 +msgid "0 is unlimited" +msgstr "" + +#: templates/admin.php:12 +msgid "Maximum input size for ZIP files" +msgstr "" + +#: templates/admin.php:15 +msgid "Save" +msgstr "" + +#: templates/index.php:7 +msgid "New" +msgstr "" + +#: templates/index.php:9 +msgid "Text file" +msgstr "" + +#: templates/index.php:10 +msgid "Folder" +msgstr "" + +#: templates/index.php:11 +msgid "From link" +msgstr "" + +#: templates/index.php:22 +msgid "Upload" +msgstr "" + +#: templates/index.php:29 +msgid "Cancel upload" +msgstr "" + +#: templates/index.php:42 +msgid "Nothing in here. Upload something!" +msgstr "" + +#: templates/index.php:52 +msgid "Share" +msgstr "" + +#: templates/index.php:54 +msgid "Download" +msgstr "" + +#: templates/index.php:77 +msgid "Upload too large" +msgstr "" + +#: templates/index.php:79 +msgid "" +"The files you are trying to upload exceed the maximum size for file uploads " +"on this server." +msgstr "" + +#: templates/index.php:84 +msgid "Files are being scanned, please wait." +msgstr "" + +#: templates/index.php:87 +msgid "Current scanning" +msgstr "" diff --git a/l10n/zu_ZA/files_encryption.po b/l10n/zu_ZA/files_encryption.po new file mode 100644 index 00000000000..eb5d7a228c6 --- /dev/null +++ b/l10n/zu_ZA/files_encryption.po @@ -0,0 +1,34 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-11-06 00:00+0100\n" +"PO-Revision-Date: 2012-08-12 22:33+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zu_ZA\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: templates/settings.php:3 +msgid "Encryption" +msgstr "" + +#: templates/settings.php:4 +msgid "Exclude the following file types from encryption" +msgstr "" + +#: templates/settings.php:5 +msgid "None" +msgstr "" + +#: templates/settings.php:10 +msgid "Enable Encryption" +msgstr "" diff --git a/l10n/zu_ZA/files_external.po b/l10n/zu_ZA/files_external.po new file mode 100644 index 00000000000..a049eb976de --- /dev/null +++ b/l10n/zu_ZA/files_external.po @@ -0,0 +1,106 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-11-06 00:00+0100\n" +"PO-Revision-Date: 2012-08-12 22:34+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zu_ZA\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23 +msgid "Access granted" +msgstr "" + +#: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86 +msgid "Error configuring Dropbox storage" +msgstr "" + +#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40 +msgid "Grant access" +msgstr "" + +#: js/dropbox.js:73 js/google.js:72 +msgid "Fill out all required fields" +msgstr "" + +#: js/dropbox.js:85 +msgid "Please provide a valid Dropbox app key and secret." +msgstr "" + +#: js/google.js:26 js/google.js:73 js/google.js:78 +msgid "Error configuring Google Drive storage" +msgstr "" + +#: templates/settings.php:3 +msgid "External Storage" +msgstr "" + +#: templates/settings.php:7 templates/settings.php:19 +msgid "Mount point" +msgstr "" + +#: templates/settings.php:8 +msgid "Backend" +msgstr "" + +#: templates/settings.php:9 +msgid "Configuration" +msgstr "" + +#: templates/settings.php:10 +msgid "Options" +msgstr "" + +#: templates/settings.php:11 +msgid "Applicable" +msgstr "" + +#: templates/settings.php:23 +msgid "Add mount point" +msgstr "" + +#: templates/settings.php:54 templates/settings.php:62 +msgid "None set" +msgstr "" + +#: templates/settings.php:63 +msgid "All Users" +msgstr "" + +#: templates/settings.php:64 +msgid "Groups" +msgstr "" + +#: templates/settings.php:69 +msgid "Users" +msgstr "" + +#: templates/settings.php:77 templates/settings.php:107 +msgid "Delete" +msgstr "" + +#: templates/settings.php:87 +msgid "Enable User External Storage" +msgstr "" + +#: 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 "" diff --git a/l10n/zu_ZA/files_sharing.po b/l10n/zu_ZA/files_sharing.po new file mode 100644 index 00000000000..d6c87989f15 --- /dev/null +++ b/l10n/zu_ZA/files_sharing.po @@ -0,0 +1,48 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-11-06 00:00+0100\n" +"PO-Revision-Date: 2012-08-12 22:35+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zu_ZA\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: templates/authenticate.php:4 +msgid "Password" +msgstr "" + +#: templates/authenticate.php:6 +msgid "Submit" +msgstr "" + +#: templates/public.php:9 +#, php-format +msgid "%s shared the folder %s with you" +msgstr "" + +#: templates/public.php:11 +#, php-format +msgid "%s shared the file %s with you" +msgstr "" + +#: templates/public.php:14 templates/public.php:30 +msgid "Download" +msgstr "" + +#: templates/public.php:29 +msgid "No preview available for" +msgstr "" + +#: templates/public.php:35 +msgid "web services under your control" +msgstr "" diff --git a/l10n/zu_ZA/files_versions.po b/l10n/zu_ZA/files_versions.po new file mode 100644 index 00000000000..7bc842be419 --- /dev/null +++ b/l10n/zu_ZA/files_versions.po @@ -0,0 +1,42 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-11-06 00:00+0100\n" +"PO-Revision-Date: 2012-08-12 22:37+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zu_ZA\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: js/settings-personal.js:31 templates/settings-personal.php:10 +msgid "Expire all versions" +msgstr "" + +#: js/versions.js:16 +msgid "History" +msgstr "" + +#: templates/settings-personal.php:4 +msgid "Versions" +msgstr "" + +#: templates/settings-personal.php:7 +msgid "This will delete all existing backup versions of your files" +msgstr "" + +#: templates/settings.php:3 +msgid "Files Versioning" +msgstr "" + +#: templates/settings.php:4 +msgid "Enable" +msgstr "" diff --git a/l10n/zu_ZA/lib.po b/l10n/zu_ZA/lib.po new file mode 100644 index 00000000000..c844f939228 --- /dev/null +++ b/l10n/zu_ZA/lib.po @@ -0,0 +1,137 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-11-06 00:00+0100\n" +"PO-Revision-Date: 2012-07-27 22:23+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zu_ZA\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: app.php:285 +msgid "Help" +msgstr "" + +#: app.php:292 +msgid "Personal" +msgstr "" + +#: app.php:297 +msgid "Settings" +msgstr "" + +#: app.php:302 +msgid "Users" +msgstr "" + +#: app.php:309 +msgid "Apps" +msgstr "" + +#: app.php:311 +msgid "Admin" +msgstr "" + +#: files.php:328 +msgid "ZIP download is turned off." +msgstr "" + +#: files.php:329 +msgid "Files need to be downloaded one by one." +msgstr "" + +#: files.php:329 files.php:354 +msgid "Back to Files" +msgstr "" + +#: files.php:353 +msgid "Selected files too large to generate zip file." +msgstr "" + +#: json.php:28 +msgid "Application is not enabled" +msgstr "" + +#: json.php:39 json.php:64 json.php:77 json.php:89 +msgid "Authentication error" +msgstr "" + +#: json.php:51 +msgid "Token expired. Please reload page." +msgstr "" + +#: search/provider/file.php:17 search/provider/file.php:35 +msgid "Files" +msgstr "" + +#: search/provider/file.php:26 search/provider/file.php:33 +msgid "Text" +msgstr "" + +#: search/provider/file.php:29 +msgid "Images" +msgstr "" + +#: template.php:103 +msgid "seconds ago" +msgstr "" + +#: template.php:104 +msgid "1 minute ago" +msgstr "" + +#: template.php:105 +#, php-format +msgid "%d minutes ago" +msgstr "" + +#: template.php:108 +msgid "today" +msgstr "" + +#: template.php:109 +msgid "yesterday" +msgstr "" + +#: template.php:110 +#, php-format +msgid "%d days ago" +msgstr "" + +#: template.php:111 +msgid "last month" +msgstr "" + +#: template.php:112 +msgid "months ago" +msgstr "" + +#: template.php:113 +msgid "last year" +msgstr "" + +#: template.php:114 +msgid "years ago" +msgstr "" + +#: updater.php:75 +#, php-format +msgid "%s is available. Get <a href=\"%s\">more information</a>" +msgstr "" + +#: updater.php:77 +msgid "up to date" +msgstr "" + +#: updater.php:80 +msgid "updates check is disabled" +msgstr "" diff --git a/l10n/zu_ZA/settings.po b/l10n/zu_ZA/settings.po new file mode 100644 index 00000000000..ce3a223ce20 --- /dev/null +++ b/l10n/zu_ZA/settings.po @@ -0,0 +1,320 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-11-06 00:00+0100\n" +"PO-Revision-Date: 2011-07-25 16:05+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zu_ZA\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/apps/ocs.php:20 +msgid "Unable to load list from App Store" +msgstr "" + +#: ajax/creategroup.php:10 +msgid "Group already exists" +msgstr "" + +#: ajax/creategroup.php:19 +msgid "Unable to add group" +msgstr "" + +#: ajax/enableapp.php:12 +msgid "Could not enable app. " +msgstr "" + +#: ajax/lostpassword.php:12 +msgid "Email saved" +msgstr "" + +#: ajax/lostpassword.php:14 +msgid "Invalid email" +msgstr "" + +#: ajax/openid.php:13 +msgid "OpenID Changed" +msgstr "" + +#: ajax/openid.php:15 ajax/setlanguage.php:17 ajax/setlanguage.php:20 +msgid "Invalid request" +msgstr "" + +#: ajax/removegroup.php:13 +msgid "Unable to delete group" +msgstr "" + +#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:12 +msgid "Authentication error" +msgstr "" + +#: ajax/removeuser.php:24 +msgid "Unable to delete user" +msgstr "" + +#: ajax/setlanguage.php:15 +msgid "Language changed" +msgstr "" + +#: ajax/togglegroups.php:22 +#, php-format +msgid "Unable to add user to group %s" +msgstr "" + +#: ajax/togglegroups.php:28 +#, php-format +msgid "Unable to remove user from group %s" +msgstr "" + +#: js/apps.js:28 js/apps.js:67 +msgid "Disable" +msgstr "" + +#: js/apps.js:28 js/apps.js:55 +msgid "Enable" +msgstr "" + +#: js/personal.js:69 +msgid "Saving..." +msgstr "" + +#: personal.php:42 personal.php:43 +msgid "__language_name__" +msgstr "" + +#: templates/admin.php:14 +msgid "Security Warning" +msgstr "" + +#: templates/admin.php:17 +msgid "" +"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." +msgstr "" + +#: templates/admin.php:31 +msgid "Cron" +msgstr "" + +#: templates/admin.php:37 +msgid "Execute one task with each page loaded" +msgstr "" + +#: 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 "" + +#: 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 "" + +#: templates/admin.php:56 +msgid "Sharing" +msgstr "" + +#: templates/admin.php:61 +msgid "Enable Share API" +msgstr "" + +#: templates/admin.php:62 +msgid "Allow apps to use the Share API" +msgstr "" + +#: templates/admin.php:67 +msgid "Allow links" +msgstr "" + +#: templates/admin.php:68 +msgid "Allow users to share items to the public with links" +msgstr "" + +#: templates/admin.php:73 +msgid "Allow resharing" +msgstr "" + +#: templates/admin.php:74 +msgid "Allow users to share items shared with them again" +msgstr "" + +#: templates/admin.php:79 +msgid "Allow users to share with anyone" +msgstr "" + +#: templates/admin.php:81 +msgid "Allow users to only share with users in their groups" +msgstr "" + +#: templates/admin.php:88 +msgid "Log" +msgstr "" + +#: templates/admin.php:116 +msgid "More" +msgstr "" + +#: templates/admin.php:124 +msgid "" +"Developed by the <a href=\"http://ownCloud.org/contact\" " +"target=\"_blank\">ownCloud community</a>, the <a " +"href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is " +"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" " +"target=\"_blank\"><abbr title=\"Affero General Public " +"License\">AGPL</abbr></a>." +msgstr "" + +#: templates/apps.php:10 +msgid "Add your App" +msgstr "" + +#: templates/apps.php:11 +msgid "More Apps" +msgstr "" + +#: templates/apps.php:27 +msgid "Select an App" +msgstr "" + +#: templates/apps.php:31 +msgid "See application page at apps.owncloud.com" +msgstr "" + +#: templates/apps.php:32 +msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" +msgstr "" + +#: templates/help.php:9 +msgid "Documentation" +msgstr "" + +#: templates/help.php:10 +msgid "Managing Big Files" +msgstr "" + +#: templates/help.php:11 +msgid "Ask a question" +msgstr "" + +#: templates/help.php:22 +msgid "Problems connecting to help database." +msgstr "" + +#: templates/help.php:23 +msgid "Go there manually." +msgstr "" + +#: templates/help.php:31 +msgid "Answer" +msgstr "" + +#: templates/personal.php:8 +#, php-format +msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>" +msgstr "" + +#: templates/personal.php:12 +msgid "Desktop and Mobile Syncing Clients" +msgstr "" + +#: templates/personal.php:13 +msgid "Download" +msgstr "" + +#: templates/personal.php:19 +msgid "Your password was changed" +msgstr "" + +#: templates/personal.php:20 +msgid "Unable to change your password" +msgstr "" + +#: templates/personal.php:21 +msgid "Current password" +msgstr "" + +#: templates/personal.php:22 +msgid "New password" +msgstr "" + +#: templates/personal.php:23 +msgid "show" +msgstr "" + +#: templates/personal.php:24 +msgid "Change password" +msgstr "" + +#: templates/personal.php:30 +msgid "Email" +msgstr "" + +#: templates/personal.php:31 +msgid "Your email address" +msgstr "" + +#: templates/personal.php:32 +msgid "Fill in an email address to enable password recovery" +msgstr "" + +#: templates/personal.php:38 templates/personal.php:39 +msgid "Language" +msgstr "" + +#: templates/personal.php:44 +msgid "Help translate" +msgstr "" + +#: templates/personal.php:51 +msgid "use this address to connect to your ownCloud in your file manager" +msgstr "" + +#: templates/users.php:21 templates/users.php:76 +msgid "Name" +msgstr "" + +#: templates/users.php:23 templates/users.php:77 +msgid "Password" +msgstr "" + +#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +msgid "Groups" +msgstr "" + +#: templates/users.php:32 +msgid "Create" +msgstr "" + +#: templates/users.php:35 +msgid "Default Quota" +msgstr "" + +#: templates/users.php:55 templates/users.php:138 +msgid "Other" +msgstr "" + +#: templates/users.php:80 templates/users.php:112 +msgid "Group Admin" +msgstr "" + +#: templates/users.php:82 +msgid "Quota" +msgstr "" + +#: templates/users.php:146 +msgid "Delete" +msgstr "" diff --git a/l10n/zu_ZA/user_ldap.po b/l10n/zu_ZA/user_ldap.po new file mode 100644 index 00000000000..a4f2985ab0e --- /dev/null +++ b/l10n/zu_ZA/user_ldap.po @@ -0,0 +1,170 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-11-06 00:00+0100\n" +"PO-Revision-Date: 2012-08-12 22:45+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zu_ZA\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: templates/settings.php:8 +msgid "Host" +msgstr "" + +#: templates/settings.php:8 +msgid "" +"You can omit the protocol, except you require SSL. Then start with ldaps://" +msgstr "" + +#: templates/settings.php:9 +msgid "Base DN" +msgstr "" + +#: templates/settings.php:9 +msgid "You can specify Base DN for users and groups in the Advanced tab" +msgstr "" + +#: templates/settings.php:10 +msgid "User DN" +msgstr "" + +#: templates/settings.php:10 +msgid "" +"The DN of the client user with which the bind shall be done, e.g. " +"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " +"empty." +msgstr "" + +#: templates/settings.php:11 +msgid "Password" +msgstr "" + +#: templates/settings.php:11 +msgid "For anonymous access, leave DN and Password empty." +msgstr "" + +#: templates/settings.php:12 +msgid "User Login Filter" +msgstr "" + +#: templates/settings.php:12 +#, php-format +msgid "" +"Defines the filter to apply, when login is attempted. %%uid replaces the " +"username in the login action." +msgstr "" + +#: templates/settings.php:12 +#, php-format +msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" +msgstr "" + +#: templates/settings.php:13 +msgid "User List Filter" +msgstr "" + +#: templates/settings.php:13 +msgid "Defines the filter to apply, when retrieving users." +msgstr "" + +#: templates/settings.php:13 +msgid "without any placeholder, e.g. \"objectClass=person\"." +msgstr "" + +#: templates/settings.php:14 +msgid "Group Filter" +msgstr "" + +#: templates/settings.php:14 +msgid "Defines the filter to apply, when retrieving groups." +msgstr "" + +#: templates/settings.php:14 +msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." +msgstr "" + +#: templates/settings.php:17 +msgid "Port" +msgstr "" + +#: templates/settings.php:18 +msgid "Base User Tree" +msgstr "" + +#: templates/settings.php:19 +msgid "Base Group Tree" +msgstr "" + +#: templates/settings.php:20 +msgid "Group-Member association" +msgstr "" + +#: templates/settings.php:21 +msgid "Use TLS" +msgstr "" + +#: templates/settings.php:21 +msgid "Do not use it for SSL connections, it will fail." +msgstr "" + +#: templates/settings.php:22 +msgid "Case insensitve LDAP server (Windows)" +msgstr "" + +#: templates/settings.php:23 +msgid "Turn off SSL certificate validation." +msgstr "" + +#: templates/settings.php:23 +msgid "" +"If connection only works with this option, import the LDAP server's SSL " +"certificate in your ownCloud server." +msgstr "" + +#: templates/settings.php:23 +msgid "Not recommended, use for testing only." +msgstr "" + +#: templates/settings.php:24 +msgid "User Display Name Field" +msgstr "" + +#: templates/settings.php:24 +msgid "The LDAP attribute to use to generate the user`s ownCloud name." +msgstr "" + +#: templates/settings.php:25 +msgid "Group Display Name Field" +msgstr "" + +#: templates/settings.php:25 +msgid "The LDAP attribute to use to generate the groups`s ownCloud name." +msgstr "" + +#: templates/settings.php:27 +msgid "in bytes" +msgstr "" + +#: templates/settings.php:29 +msgid "in seconds. A change empties the cache." +msgstr "" + +#: templates/settings.php:30 +msgid "" +"Leave empty for user name (default). Otherwise, specify an LDAP/AD " +"attribute." +msgstr "" + +#: templates/settings.php:32 +msgid "Help" +msgstr "" diff --git a/lib/MDB2/Driver/Function/sqlite3.php b/lib/MDB2/Driver/Function/sqlite3.php index 0bddde5bf3f..4147a48199f 100644 --- a/lib/MDB2/Driver/Function/sqlite3.php +++ b/lib/MDB2/Driver/Function/sqlite3.php @@ -92,7 +92,7 @@ class MDB2_Driver_Function_sqlite3 extends MDB2_Driver_Function_Common function substring($value, $position = 1, $length = null) { if (!is_null($length)) { - return "substr($value,$position,$length)"; + return "substr($value, $position, $length)"; } return "substr($value, $position, length($value))"; } diff --git a/lib/MDB2/Driver/Reverse/sqlite3.php b/lib/MDB2/Driver/Reverse/sqlite3.php index 36626478ce8..97037809549 100644 --- a/lib/MDB2/Driver/Reverse/sqlite3.php +++ b/lib/MDB2/Driver/Reverse/sqlite3.php @@ -476,7 +476,7 @@ class MDB2_Driver_Reverse_sqlite3 extends MDB2_Driver_Reverse_Common $definition['unique'] = true; $count = count($column_names); for ($i=0; $i<$count; ++$i) { - $column_name = strtok($column_names[$i]," "); + $column_name = strtok($column_names[$i], " "); $collation = strtok(" "); $definition['fields'][$column_name] = array( 'position' => $i+1 diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php index 9757e4faf94..fa4c91c1269 100644 --- a/lib/MDB2/Driver/sqlite3.php +++ b/lib/MDB2/Driver/sqlite3.php @@ -153,7 +153,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common if($this->connection) { return $this->connection->escapeString($text); }else{ - return str_replace("'","''",$text);//TODO; more + return str_replace("'", "''", $text);//TODO; more } } @@ -276,7 +276,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common * @access public * @since 2.1.1 */ - function setTransactionIsolation($isolation,$options=array()) + function setTransactionIsolation($isolation, $options=array()) { $this->debug('Setting transaction isolation level', __FUNCTION__, array('is_manip' => true)); switch ($isolation) { @@ -351,7 +351,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common } if ($database_file !== ':memory:') { - if(!strpos($database_file,'.db')) { + if(!strpos($database_file, '.db')) { $database_file="$datadir/$database_file.db"; } if (!file_exists($database_file)) { @@ -387,7 +387,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common $php_errormsg = ''; $this->connection = new SQLite3($database_file); - if(is_callable(array($this->connection,'busyTimeout'))) {//busy timout is only available in php>=5.3 + if(is_callable(array($this->connection, 'busyTimeout'))) {//busy timout is only available in php>=5.3 $this->connection->busyTimeout(100); } $this->_lasterror = $this->connection->lastErrorMsg(); @@ -397,8 +397,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common } if ($this->fix_assoc_fields_names || - $this->options['portability'] & MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES) - { + $this->options['portability'] & MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES) { $this->connection->exec("PRAGMA short_column_names = 1"); $this->fix_assoc_fields_names = true; } @@ -1142,9 +1141,9 @@ class MDB2_Statement_sqlite3 extends MDB2_Statement_Common function bindValue($parameter, $value, $type = null) { if($type) { $type=$this->getParamType($type); - $this->statement->bindValue($parameter,$value,$type); + $this->statement->bindValue($parameter, $value, $type); }else{ - $this->statement->bindValue($parameter,$value); + $this->statement->bindValue($parameter, $value); } return MDB2_OK; } @@ -1165,9 +1164,9 @@ class MDB2_Statement_sqlite3 extends MDB2_Statement_Common function bindParam($parameter, &$value, $type = null) { if($type) { $type=$this->getParamType($type); - $this->statement->bindParam($parameter,$value,$type); + $this->statement->bindParam($parameter, $value, $type); }else{ - $this->statement->bindParam($parameter,$value); + $this->statement->bindParam($parameter, $value); } return MDB2_OK; } @@ -1318,7 +1317,7 @@ class MDB2_Statement_sqlite3 extends MDB2_Statement_Common }else{ $types=null; } - $err = $this->bindValueArray($values,$types); + $err = $this->bindValueArray($values, $types); if (PEAR::isError($err)) { return $this->db->raiseError(MDB2_ERROR, null, null, 'Binding Values failed with message: ' . $err->getMessage(), __FUNCTION__); diff --git a/lib/app.php b/lib/app.php index 231037cbd3b..79c1d83314f 100755 --- a/lib/app.php +++ b/lib/app.php @@ -92,7 +92,7 @@ class OC_App{ * @param string/array $types * @return bool */ - public static function isType($app,$types) { + public static function isType($app, $types) { if(is_string($types)) { $types=array($types); } @@ -185,7 +185,7 @@ class OC_App{ }else{ $download=OC_OCSClient::getApplicationDownload($app, 1); if(isset($download['downloadlink']) and $download['downloadlink']!='') { - $app=OC_Installer::installApp(array('source'=>'http','href'=>$download['downloadlink'])); + $app=OC_Installer::installApp(array('source'=>'http', 'href'=>$download['downloadlink'])); } } } @@ -404,7 +404,7 @@ class OC_App{ * @return array * @note all data is read from info.xml, not just pre-defined fields */ - public static function getAppInfo($appid,$path=false) { + public static function getAppInfo($appid, $path=false) { if($path) { $file=$appid; }else{ @@ -523,21 +523,21 @@ class OC_App{ /** * register a settings form to be shown */ - public static function registerSettings($app,$page) { + public static function registerSettings($app, $page) { self::$settingsForms[]= $app.'/'.$page.'.php'; } /** * register an admin form to be shown */ - public static function registerAdmin($app,$page) { + public static function registerAdmin($app, $page) { self::$adminForms[]= $app.'/'.$page.'.php'; } /** * register a personal form to be shown */ - public static function registerPersonal($app,$page) { + public static function registerPersonal($app, $page) { self::$personalForms[]= $app.'/'.$page.'.php'; } diff --git a/lib/appconfig.php b/lib/appconfig.php index ed0e8f1d0bd..1f2d576af87 100644 --- a/lib/appconfig.php +++ b/lib/appconfig.php @@ -107,7 +107,7 @@ class OC_Appconfig{ * @param string $key * @return bool */ - public static function hasKey($app,$key) { + public static function hasKey($app, $key) { $exists = self::getKeys( $app ); return in_array( $key, $exists ); } @@ -170,7 +170,7 @@ class OC_Appconfig{ * @param key * @return array */ - public static function getValues($app,$key) { + public static function getValues($app, $key) { if($app!==false and $key!==false) { return false; } diff --git a/lib/archive.php b/lib/archive.php index a9c245eaf43..61239c82076 100644 --- a/lib/archive.php +++ b/lib/archive.php @@ -42,14 +42,14 @@ abstract class OC_Archive{ * @param string source either a local file or string data * @return bool */ - abstract function addFile($path,$source=''); + abstract function addFile($path, $source=''); /** * rename a file or folder in the archive * @param string source * @param string dest * @return bool */ - abstract function rename($source,$dest); + abstract function rename($source, $dest); /** * get the uncompressed size of a file in the archive * @param string path @@ -85,7 +85,7 @@ abstract class OC_Archive{ * @param string dest * @return bool */ - abstract function extractFile($path,$dest); + abstract function extractFile($path, $dest); /** * extract the archive * @param string path @@ -111,14 +111,14 @@ abstract class OC_Archive{ * @param string mode * @return resource */ - abstract function getStream($path,$mode); + abstract function getStream($path, $mode); /** * add a folder and all it's content * @param string $path * @param string source * @return bool */ - function addRecursive($path,$source) { + function addRecursive($path, $source) { if($dh=opendir($source)) { $this->addFolder($path); while($file=readdir($dh)) { diff --git a/lib/archive/tar.php b/lib/archive/tar.php index 86d39b88968..0fa633c6038 100644 --- a/lib/archive/tar.php +++ b/lib/archive/tar.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once '3rdparty/Archive/Tar.php'; +require_once 'Archive/Tar.php'; class OC_Archive_TAR extends OC_Archive{ const PLAIN=0; @@ -23,7 +23,7 @@ class OC_Archive_TAR extends OC_Archive{ private $path; function __construct($source) { - $types=array(null,'gz','bz'); + $types=array(null, 'gz', 'bz'); $this->path=$source; $this->tar=new Archive_Tar($source, $types[self::getTarType($source)]); } @@ -84,7 +84,7 @@ class OC_Archive_TAR extends OC_Archive{ * @param string source either a local file or string data * @return bool */ - function addFile($path,$source='') { + function addFile($path, $source='') { if($this->fileExists($path)) { $this->remove($path); } @@ -107,7 +107,7 @@ class OC_Archive_TAR extends OC_Archive{ * @param string dest * @return bool */ - function rename($source,$dest) { + function rename($source, $dest) { //no proper way to delete, rename entire archive, rename file and remake archive $tmp=OCP\Files::tmpFolder(); $this->tar->extract($tmp); @@ -130,8 +130,7 @@ class OC_Archive_TAR extends OC_Archive{ if( $file == $header['filename'] or $file.'/' == $header['filename'] or '/'.$file.'/' == $header['filename'] - or '/'.$file == $header['filename']) - { + or '/'.$file == $header['filename']) { return $header; } } @@ -214,7 +213,7 @@ class OC_Archive_TAR extends OC_Archive{ * @param string dest * @return bool */ - function extractFile($path,$dest) { + function extractFile($path, $dest) { $tmp=OCP\Files::tmpFolder(); if(!$this->fileExists($path)) { return false; @@ -294,7 +293,7 @@ class OC_Archive_TAR extends OC_Archive{ * @param string mode * @return resource */ - function getStream($path,$mode) { + function getStream($path, $mode) { if(strrpos($path, '.')!==false) { $ext=substr($path, strrpos($path, '.')); }else{ @@ -309,7 +308,7 @@ class OC_Archive_TAR extends OC_Archive{ if($mode=='r' or $mode=='rb') { return fopen($tmpFile, $mode); }else{ - OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack'); + OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this, 'writeBack'); self::$tempFiles[$tmpFile]=$path; return fopen('close://'.$tmpFile, $mode); } @@ -334,7 +333,7 @@ class OC_Archive_TAR extends OC_Archive{ $this->tar->_close(); $this->tar=null; } - $types=array(null,'gz','bz'); + $types=array(null, 'gz', 'bz'); $this->tar=new Archive_Tar($this->path, $types[self::getTarType($this->path)]); } } diff --git a/lib/archive/zip.php b/lib/archive/zip.php index d016c692e35..1c967baa08f 100644 --- a/lib/archive/zip.php +++ b/lib/archive/zip.php @@ -35,7 +35,7 @@ class OC_Archive_ZIP extends OC_Archive{ * @param string source either a local file or string data * @return bool */ - function addFile($path,$source='') { + function addFile($path, $source='') { if($source and $source[0]=='/' and file_exists($source)) { $result=$this->zip->addFile($source, $path); }else{ @@ -53,7 +53,7 @@ class OC_Archive_ZIP extends OC_Archive{ * @param string dest * @return bool */ - function rename($source,$dest) { + function rename($source, $dest) { $source=$this->stripPath($source); $dest=$this->stripPath($dest); $this->zip->renameName($source, $dest); @@ -119,7 +119,7 @@ class OC_Archive_ZIP extends OC_Archive{ * @param string dest * @return bool */ - function extractFile($path,$dest) { + function extractFile($path, $dest) { $fp = $this->zip->getStream($path); file_put_contents($dest, $fp); } @@ -158,7 +158,7 @@ class OC_Archive_ZIP extends OC_Archive{ * @param string mode * @return resource */ - function getStream($path,$mode) { + function getStream($path, $mode) { if($mode=='r' or $mode=='rb') { return $this->zip->getStream($path); } else { @@ -171,7 +171,7 @@ class OC_Archive_ZIP extends OC_Archive{ $ext=''; } $tmpFile=OCP\Files::tmpFile($ext); - OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack'); + OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this, 'writeBack'); if($this->fileExists($path)) { $this->extractFile($path, $tmpFile); } diff --git a/lib/backgroundjob.php b/lib/backgroundjob.php index 6415f5b84aa..28b5ce3af20 100644 --- a/lib/backgroundjob.php +++ b/lib/backgroundjob.php @@ -40,11 +40,11 @@ class OC_BackgroundJob{ * @param $type execution type * @return boolean * - * This method sets the execution type of the background jobs. Possible types + * This method sets the execution type of the background jobs. Possible types * are "none", "ajax", "webcron", "cron" */ public static function setExecutionType( $type ) { - if( !in_array( $type, array('none', 'ajax', 'webcron', 'cron'))){ + if( !in_array( $type, array('none', 'ajax', 'webcron', 'cron'))) { return false; } return OC_Appconfig::setValue( 'core', 'backgroundjobs_mode', $type ); diff --git a/lib/base.php b/lib/base.php index d7d5eef3256..d4eeac82daa 100644 --- a/lib/base.php +++ b/lib/base.php @@ -221,6 +221,16 @@ class OC{ $installedVersion=OC_Config::getValue('version', '0.0.0'); $currentVersion=implode('.', OC_Util::getVersion()); if (version_compare($currentVersion, $installedVersion, '>')) { + // Check if the .htaccess is existing - this is needed for upgrades from really old ownCloud versions + if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) { + if(!OC_Util::ishtaccessworking()) { + if(!file_exists(OC::$SERVERROOT.'/data/.htaccess')) { + $content = "deny from all\n"; + $content.= "IndexIgnore *"; + file_put_contents(OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data').'/.htaccess', $content); + } + } + } OC_Log::write('core', 'starting upgrade from '.$installedVersion.' to '.$currentVersion, OC_Log::DEBUG); $result=OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/db_structure.xml'); if(!$result) { @@ -229,7 +239,7 @@ class OC{ } if(file_exists(OC::$SERVERROOT."/config/config.php") and !is_writable(OC::$SERVERROOT."/config/config.php")) { $tmpl = new OC_Template( '', 'error', 'guest' ); - $tmpl->assign('errors', array(1=>array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud"))); + $tmpl->assign('errors', array(1=>array('error'=>"Can't write into config directory 'config'", 'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud"))); $tmpl->printPage(); exit; } @@ -254,8 +264,6 @@ 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" ); @@ -312,7 +320,7 @@ class OC{ public static function init() { // register autoloader - spl_autoload_register(array('OC','autoload')); + spl_autoload_register(array('OC', 'autoload')); setlocale(LC_ALL, 'en_US.UTF-8'); // set some stuff @@ -430,7 +438,7 @@ class OC{ OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted'); //make sure temporary files are cleaned up - register_shutdown_function(array('OC_Helper','cleanTmp')); + register_shutdown_function(array('OC_Helper', 'cleanTmp')); //parse the given parameters self::$REQUESTEDAPP = (isset($_GET['app']) && trim($_GET['app']) != '' && !is_null($_GET['app'])?str_replace(array('\0', '/', '\\', '..'), '', strip_tags($_GET['app'])):OC_Config::getValue('defaultapp', 'files')); @@ -516,8 +524,7 @@ class OC{ } $file_ext = substr($param['file'], -3); if ($file_ext != 'php' - || !self::loadAppScriptFile($param)) - { + || !self::loadAppScriptFile($param)) { header('HTTP/1.0 404 Not Found'); } } @@ -587,8 +594,7 @@ class OC{ if(!isset($_COOKIE["oc_remember_login"]) || !isset($_COOKIE["oc_token"]) || !isset($_COOKIE["oc_username"]) - || !$_COOKIE["oc_remember_login"]) - { + || !$_COOKIE["oc_remember_login"]) { return false; } OC_App::loadApps(array('authentication')); @@ -613,9 +619,9 @@ class OC{ OC_Util::redirectToDefaultPage(); // doesn't return } - // if you reach this point you have changed your password + // if you reach this point you have changed your password // or you are an attacker - // we can not delete tokens here because users may reach + // we can not delete tokens here because users may reach // this point multiple times after a password change OC_Log::write('core', 'Authentication cookie rejected for user '.$_COOKIE['oc_username'], OC_Log::WARN); } @@ -659,7 +665,7 @@ class OC{ } OC_App::loadApps(array('authentication')); if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) { - //OC_Log::write('core',"Logged in with HTTP Authentication",OC_Log::DEBUG); + //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG); OC_User::unsetMagicInCookie(); $_REQUEST['redirect_url'] = (isset($_SERVER['REQUEST_URI'])?$_SERVER['REQUEST_URI']:''); OC_Util::redirectToDefaultPage(); diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php index 5bd38240d44..8d963a1cf8d 100644 --- a/lib/connector/sabre/file.php +++ b/lib/connector/sabre/file.php @@ -45,7 +45,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D */ public function put($data) { - OC_Filesystem::file_put_contents($this->path,$data); + OC_Filesystem::file_put_contents($this->path, $data); return OC_Connector_Sabre_Node::getETagPropertyForPath($this->path); } @@ -57,7 +57,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D */ public function get() { - return OC_Filesystem::fopen($this->path,'rb'); + return OC_Filesystem::fopen($this->path, 'rb'); } diff --git a/lib/connector/sabre/locks.php b/lib/connector/sabre/locks.php index 8ebe324602c..a72d003bc72 100644 --- a/lib/connector/sabre/locks.php +++ b/lib/connector/sabre/locks.php @@ -45,10 +45,10 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract { // but otherwise reading locks from SQLite Databases will return // nothing $query = 'SELECT * FROM `*PREFIX*locks` WHERE `userid` = ? AND (`created` + `timeout`) > '.time().' AND (( `uri` = ?)'; - $params = array(OC_User::getUser(),$uri); + $params = array(OC_User::getUser(), $uri); // We need to check locks for every part in the uri. - $uriParts = explode('/',$uri); + $uriParts = explode('/', $uri); // We already covered the last part of the uri array_pop($uriParts); @@ -102,7 +102,7 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract { * @param Sabre_DAV_Locks_LockInfo $lockInfo * @return bool */ - public function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) { + public function lock($uri, Sabre_DAV_Locks_LockInfo $lockInfo) { // We're making the lock timeout 5 minutes $lockInfo->timeout = 300; @@ -134,10 +134,10 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract { * @param Sabre_DAV_Locks_LockInfo $lockInfo * @return bool */ - public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) { + public function unlock($uri, Sabre_DAV_Locks_LockInfo $lockInfo) { $query = OC_DB::prepare( 'DELETE FROM `*PREFIX*locks` WHERE `userid` = ? AND `uri` = ? AND `token` = ?' ); - $result = $query->execute( array(OC_User::getUser(),$uri,$lockInfo->token)); + $result = $query->execute( array(OC_User::getUser(), $uri, $lockInfo->token)); return $result->numRows() === 1; diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php index 72de9723774..5fc106b85ed 100644 --- a/lib/connector/sabre/node.php +++ b/lib/connector/sabre/node.php @@ -80,12 +80,12 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr $newPath = $parentPath . '/' . $newName; $oldPath = $this->path; - OC_Filesystem::rename($this->path,$newPath); + OC_Filesystem::rename($this->path, $newPath); $this->path = $newPath; $query = OC_DB::prepare( 'UPDATE `*PREFIX*properties` SET `propertypath` = ? WHERE `userid` = ? AND `propertypath` = ?' ); - $query->execute( array( $newPath,OC_User::getUser(), $oldPath )); + $query->execute( array( $newPath, OC_User::getUser(), $oldPath )); } @@ -156,10 +156,10 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr } else { if(!array_key_exists( $propertyName, $existing )) { $query = OC_DB::prepare( 'INSERT INTO `*PREFIX*properties` (`userid`,`propertypath`,`propertyname`,`propertyvalue`) VALUES(?,?,?,?)' ); - $query->execute( array( OC_User::getUser(), $this->path, $propertyName,$propertyValue )); + $query->execute( array( OC_User::getUser(), $this->path, $propertyName, $propertyValue )); } else { $query = OC_DB::prepare( 'UPDATE `*PREFIX*properties` SET `propertyvalue` = ? WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?' ); - $query->execute( array( $propertyValue,OC_User::getUser(), $this->path, $propertyName )); + $query->execute( array( $propertyValue, OC_User::getUser(), $this->path, $propertyName )); } } } diff --git a/lib/connector/sabre/principal.php b/lib/connector/sabre/principal.php index 763503721f8..04be410ac85 100644 --- a/lib/connector/sabre/principal.php +++ b/lib/connector/sabre/principal.php @@ -46,7 +46,7 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend { * @return array */ public function getPrincipalByPath($path) { - list($prefix,$name) = explode('/', $path); + list($prefix, $name) = explode('/', $path); if ($prefix == 'principals' && OC_User::userExists($name)) { return array( @@ -83,7 +83,7 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend { * @return array */ public function getGroupMembership($principal) { - list($prefix,$name) = Sabre_DAV_URLUtil::splitPath($principal); + list($prefix, $name) = Sabre_DAV_URLUtil::splitPath($principal); $group_membership = array(); if ($prefix == 'principals') { diff --git a/lib/connector/sabre/quotaplugin.php b/lib/connector/sabre/quotaplugin.php new file mode 100644 index 00000000000..a56a65ad863 --- /dev/null +++ b/lib/connector/sabre/quotaplugin.php @@ -0,0 +1,59 @@ +<?php + +/** + * This plugin check user quota and deny creating files when they exceeds the quota. + * + * @copyright Copyright (C) 2012 entreCables S.L. All rights reserved. + * @author Sergio Cambra + * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License + */ +class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin { + + /** + * Reference to main server object + * + * @var Sabre_DAV_Server + */ + private $server; + + /** + * This initializes the plugin. + * + * This function is called by Sabre_DAV_Server, after + * addPlugin is called. + * + * This method should set up the requires event subscriptions. + * + * @param Sabre_DAV_Server $server + * @return void + */ + public function initialize(Sabre_DAV_Server $server) { + + $this->server = $server; + $this->server->subscribeEvent('beforeWriteContent', array($this, 'checkQuota'), 10); + $this->server->subscribeEvent('beforeCreateFile', array($this, 'checkQuota'), 10); + + } + + /** + * This method is called before any HTTP method and forces users to be authenticated + * + * @param string $method + * @throws Sabre_DAV_Exception + * @return bool + */ + public function checkQuota($uri, $data = null) { + $expected = $this->server->httpRequest->getHeader('X-Expected-Entity-Length'); + $length = $expected ? $expected : $this->server->httpRequest->getHeader('Content-Length'); + if ($length) { + if (substr($uri, 0, 1)!=='/') { + $uri='/'.$uri; + } + list($parentUri, $newName) = Sabre_DAV_URLUtil::splitPath($uri); + if ($length > OC_Filesystem::free_space($parentUri)) { + throw new Sabre_DAV_Exception('Quota exceeded. File is too big.'); + } + } + return true; + } +} diff --git a/lib/db.php b/lib/db.php index a43f2ad20b2..fba2687967f 100644 --- a/lib/db.php +++ b/lib/db.php @@ -115,7 +115,7 @@ class OC_DB { $pass = OC_Config::getValue( "dbpassword", "" ); $type = OC_Config::getValue( "dbtype", "sqlite" ); if(strpos($host, ':')) { - list($host, $port)=explode(':', $host,2); + list($host, $port)=explode(':', $host, 2); }else{ $port=false; } @@ -324,7 +324,7 @@ class OC_DB { if( PEAR::isError($result)) { $entry = 'DB Error: "'.$result->getMessage().'"<br />'; $entry .= 'Offending command was: '.htmlentities($query).'<br />'; - OC_Log::write('core', $entry,OC_Log::FATAL); + OC_Log::write('core', $entry, OC_Log::FATAL); error_log('DB error: '.$entry); die( $entry ); } @@ -334,7 +334,7 @@ class OC_DB { }catch(PDOException $e) { $entry = 'DB Error: "'.$e->getMessage().'"<br />'; $entry .= 'Offending command was: '.htmlentities($query).'<br />'; - OC_Log::write('core', $entry,OC_Log::FATAL); + OC_Log::write('core', $entry, OC_Log::FATAL); error_log('DB error: '.$entry); die( $entry ); } @@ -767,8 +767,8 @@ class PDOStatementWrapper{ /** * pass all other function directly to the PDOStatement */ - public function __call($name,$arguments) { - return call_user_func_array(array($this->statement,$name), $arguments); + public function __call($name, $arguments) { + return call_user_func_array(array($this->statement, $name), $arguments); } /** diff --git a/lib/eventsource.php b/lib/eventsource.php index 3bada131bdd..578441ee707 100644 --- a/lib/eventsource.php +++ b/lib/eventsource.php @@ -56,7 +56,7 @@ class OC_EventSource{ * * if only one paramater is given, a typeless message will be send with that paramater as data */ - public function send($type,$data=null) { + public function send($type, $data=null) { if(is_null($data)) { $data=$type; $type=null; diff --git a/lib/filecache.php b/lib/filecache.php index fee3b398251..6263e03fc64 100644 --- a/lib/filecache.php +++ b/lib/filecache.php @@ -42,7 +42,7 @@ class OC_FileCache{ * - encrypted * - versioned */ - public static function get($path,$root=false) { + public static function get($path, $root=false) { if(OC_FileCache_Update::hasUpdated($path, $root)) { if($root===false) {//filesystem hooks are only valid for the default root OC_Hook::emit('OC_Filesystem', 'post_write', array('path'=>$path)); @@ -61,7 +61,7 @@ class OC_FileCache{ * * $data is an assiciative array in the same format as returned by get */ - public static function put($path,$data,$root=false) { + public static function put($path, $data, $root=false) { if($root===false) { $root=OC_Filesystem::getRoot(); } @@ -117,10 +117,10 @@ class OC_FileCache{ * @param int $id * @param array $data */ - private static function update($id,$data) { + private static function update($id, $data) { $arguments=array(); $queryParts=array(); - foreach(array('size','mtime','ctime','mimetype','encrypted','versioned','writable') as $attribute) { + foreach(array('size','mtime','ctime','mimetype','encrypted','versioned', 'writable') as $attribute) { if(isset($data[$attribute])) { //Convert to int it args are false if($data[$attribute] === false) { @@ -151,7 +151,7 @@ class OC_FileCache{ * @param string newPath * @param string root (optional) */ - public static function move($oldPath,$newPath,$root=false) { + public static function move($oldPath, $newPath, $root=false) { if($root===false) { $root=OC_Filesystem::getRoot(); } @@ -190,7 +190,7 @@ class OC_FileCache{ * @param string path * @param string root (optional) */ - public static function delete($path,$root=false) { + public static function delete($path, $root=false) { if($root===false) { $root=OC_Filesystem::getRoot(); } @@ -211,7 +211,7 @@ class OC_FileCache{ * @param string root (optional) * @return array of filepaths */ - public static function search($search,$returnData=false,$root=false) { + public static function search($search, $returnData=false, $root=false) { if($root===false) { $root=OC_Filesystem::getRoot(); } @@ -227,7 +227,7 @@ class OC_FileCache{ $where = '`name` LIKE ? AND `user`=?'; } $query=OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*fscache` WHERE '.$where); - $result=$query->execute(array("%$search%",OC_User::getUser())); + $result=$query->execute(array("%$search%", OC_User::getUser())); $names=array(); while($row=$result->fetchRow()) { if(!$returnData) { @@ -255,7 +255,7 @@ class OC_FileCache{ * - encrypted * - versioned */ - public static function getFolderContent($path,$root=false,$mimetype_filter='') { + public static function getFolderContent($path, $root=false, $mimetype_filter='') { if(OC_FileCache_Update::hasUpdated($path, $root, true)) { OC_FileCache_Update::updateFolder($path, $root); } @@ -268,7 +268,7 @@ class OC_FileCache{ * @param string root (optional) * @return bool */ - public static function inCache($path,$root=false) { + public static function inCache($path, $root=false) { return self::getId($path, $root)!=-1; } @@ -278,7 +278,7 @@ class OC_FileCache{ * @param string root (optional) * @return int */ - public static function getId($path,$root=false) { + public static function getId($path, $root=false) { if($root===false) { $root=OC_Filesystem::getRoot(); } @@ -314,7 +314,7 @@ class OC_FileCache{ * @param string user (optional) * @return string */ - public static function getPath($id,$user='') { + public static function getPath($id, $user='') { if(!$user) { $user=OC_User::getUser(); } @@ -348,12 +348,12 @@ class OC_FileCache{ * @param int $sizeDiff * @param string root (optinal) */ - public static function increaseSize($path,$sizeDiff, $root=false) { + public static function increaseSize($path, $sizeDiff, $root=false) { if($sizeDiff==0) return; $id=self::getId($path, $root); while($id!=-1) {//walk up the filetree increasing the size of all parent folders $query=OC_DB::prepare('UPDATE `*PREFIX*fscache` SET `size`=`size`+? WHERE `id`=?'); - $query->execute(array($sizeDiff,$id)); + $query->execute(array($sizeDiff, $id)); $id=self::getParentId($path); $path=dirname($path); } @@ -366,7 +366,7 @@ class OC_FileCache{ * @param int count (optional) * @param string root (optional) */ - public static function scan($path,$eventSource=false,&$count=0,$root=false) { + public static function scan($path, $eventSource=false,&$count=0, $root=false) { if($eventSource) { $eventSource->send('scanning', array('file'=>$path, 'count'=>$count)); } @@ -401,8 +401,8 @@ class OC_FileCache{ } } - OC_FileCache_Update::cleanFolder($path,$root); - self::increaseSize($path,$totalSize,$root); + OC_FileCache_Update::cleanFolder($path, $root); + self::increaseSize($path, $totalSize, $root); } /** @@ -411,7 +411,7 @@ class OC_FileCache{ * @param string root (optional) * @return int size of the scanned file */ - public static function scanFile($path,$root=false) { + public static function scanFile($path, $root=false) { // NOTE: Ugly hack to prevent shared files from going into the cache (the source already exists somewhere in the cache) if (substr($path, 0, 7) == '/Shared') { return; @@ -448,12 +448,12 @@ class OC_FileCache{ * @return array of file paths * * $part1 and $part2 together form the complete mimetype. - * e.g. searchByMime('text','plain') + * e.g. searchByMime('text', 'plain') * * seccond mimetype part can be ommited * e.g. searchByMime('audio') */ - public static function searchByMime($part1,$part2=null,$root=false) { + public static function searchByMime($part1, $part2=null, $root=false) { if($root===false) { $root=OC_Filesystem::getRoot(); } @@ -500,7 +500,7 @@ class OC_FileCache{ * trigger an update for the cache by setting the mtimes to 0 * @param string $user (optional) */ - public static function triggerUpdate($user=''){ + public static function triggerUpdate($user='') { if($user) { $query=OC_DB::prepare('UPDATE `*PREFIX*fscache` SET `mtime`=0 WHERE `user`=? AND `mimetype`="httpd/unix-directory"'); $query->execute(array($user)); diff --git a/lib/filecache/cached.php b/lib/filecache/cached.php index 9b1eb4f7803..7458322fb14 100644 --- a/lib/filecache/cached.php +++ b/lib/filecache/cached.php @@ -13,7 +13,7 @@ class OC_FileCache_Cached{ public static $savedData=array(); - public static function get($path,$root=false) { + public static function get($path, $root=false) { if($root===false) { $root=OC_Filesystem::getRoot(); } @@ -61,7 +61,7 @@ class OC_FileCache_Cached{ * - encrypted * - versioned */ - public static function getFolderContent($path,$root=false,$mimetype_filter='') { + public static function getFolderContent($path, $root=false, $mimetype_filter='') { if($root===false) { $root=OC_Filesystem::getRoot(); } diff --git a/lib/filecache/update.php b/lib/filecache/update.php index f9d64d0ae99..bc403113e7c 100644 --- a/lib/filecache/update.php +++ b/lib/filecache/update.php @@ -18,7 +18,7 @@ class OC_FileCache_Update{ * @param boolean folder * @return bool */ - public static function hasUpdated($path,$root=false,$folder=false) { + public static function hasUpdated($path, $root=false, $folder=false) { if($root===false) { $view=OC_Filesystem::getView(); }else{ @@ -46,14 +46,14 @@ class OC_FileCache_Update{ /** * delete non existing files from the cache */ - public static function cleanFolder($path,$root=false) { + public static function cleanFolder($path, $root=false) { if($root===false) { $view=OC_Filesystem::getView(); }else{ $view=new OC_FilesystemView($root); } - $cachedContent=OC_FileCache_Cached::getFolderContent($path,$root); + $cachedContent=OC_FileCache_Cached::getFolderContent($path, $root); foreach($cachedContent as $fileData) { $path=$fileData['path']; $file=$view->getRelativePath($path); @@ -72,7 +72,7 @@ class OC_FileCache_Update{ * @param string path * @param string root (optional) */ - public static function updateFolder($path,$root=false) { + public static function updateFolder($path, $root=false) { if($root===false) { $view=OC_Filesystem::getView(); }else{ @@ -85,7 +85,7 @@ class OC_FileCache_Update{ $file=$path.'/'.$filename; $isDir=$view->is_dir($file); if(self::hasUpdated($file, $root, $isDir)) { - if($isDir){ + if($isDir) { self::updateFolder($file, $root); }elseif($root===false) {//filesystem hooks are only valid for the default root OC_Hook::emit('OC_Filesystem', 'post_write', array('path'=>$file)); @@ -143,7 +143,7 @@ class OC_FileCache_Update{ * @param string path * @param string root (optional) */ - public static function update($path,$root=false) { + public static function update($path, $root=false) { if($root===false) { $view=OC_Filesystem::getView(); }else{ @@ -153,7 +153,7 @@ class OC_FileCache_Update{ $mimetype=$view->getMimeType($path); $size=0; - $cached=OC_FileCache_Cached::get($path,$root); + $cached=OC_FileCache_Cached::get($path, $root); $cachedSize=isset($cached['size'])?$cached['size']:0; if($view->is_dir($path.'/')) { @@ -165,7 +165,7 @@ class OC_FileCache_Update{ $mtime=$view->filemtime($path.'/'); $ctime=$view->filectime($path.'/'); $writable=$view->is_writable($path.'/'); - OC_FileCache::put($path, array('size'=>$size,'mtime'=>$mtime,'ctime'=>$ctime,'mimetype'=>$mimetype,'writable'=>$writable)); + OC_FileCache::put($path, array('size'=>$size,'mtime'=>$mtime,'ctime'=>$ctime,'mimetype'=>$mimetype, 'writable'=>$writable)); }else{ $count=0; OC_FileCache::scan($path, null, $count, $root); @@ -174,7 +174,7 @@ class OC_FileCache_Update{ }else{ $size=OC_FileCache::scanFile($path, $root); } - if($path !== '' and $path !== '/'){ + if($path !== '' and $path !== '/') { OC_FileCache::increaseSize(dirname($path), $size-$cachedSize, $root); } } @@ -184,7 +184,7 @@ class OC_FileCache_Update{ * @param string path * @param string root (optional) */ - public static function delete($path,$root=false) { + public static function delete($path, $root=false) { $cached=OC_FileCache_Cached::get($path, $root); if(!isset($cached['size'])) { return; @@ -200,7 +200,7 @@ class OC_FileCache_Update{ * @param string newPath * @param string root (optional) */ - public static function rename($oldPath,$newPath,$root=false) { + public static function rename($oldPath, $newPath, $root=false) { if(!OC_FileCache::inCache($oldPath, $root)) { return; } diff --git a/lib/fileproxy.php b/lib/fileproxy.php index 3e7f1aa1c41..2f81bde64a1 100644 --- a/lib/fileproxy.php +++ b/lib/fileproxy.php @@ -51,7 +51,7 @@ class OC_FileProxy{ * * this implements a dummy proxy for all operations */ - public function __call($function,$arguments) { + public function __call($function, $arguments) { if(substr($function, 0, 3)=='pre') { return true; }else{ @@ -85,7 +85,7 @@ class OC_FileProxy{ $proxies=self::getProxies($operation); foreach($proxies as $proxy) { if(!is_null($filepath2)) { - if($proxy->$operation($filepath,$filepath2)===false) { + if($proxy->$operation($filepath, $filepath2)===false) { return false; } }else{ @@ -97,14 +97,14 @@ class OC_FileProxy{ return true; } - public static function runPostProxies($operation,$path,$result) { + public static function runPostProxies($operation, $path, $result) { if(!self::$enabled) { return $result; } $operation='post'.$operation; $proxies=self::getProxies($operation); foreach($proxies as $proxy) { - $result=$proxy->$operation($path,$result); + $result=$proxy->$operation($path, $result); } return $result; } diff --git a/lib/fileproxy/fileoperations.php b/lib/fileproxy/fileoperations.php index 23fb63fcfb1..516629adaec 100644 --- a/lib/fileproxy/fileoperations.php +++ b/lib/fileproxy/fileoperations.php @@ -28,7 +28,7 @@ class OC_FileProxy_FileOperations extends OC_FileProxy{ static $rootView; public function premkdir($path) { - if(!self::$rootView){ + if(!self::$rootView) { self::$rootView = new OC_FilesystemView(''); } return !self::$rootView->file_exists($path); diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php index 012be582a51..46bc8dc16d8 100644 --- a/lib/fileproxy/quota.php +++ b/lib/fileproxy/quota.php @@ -38,9 +38,9 @@ class OC_FileProxy_Quota extends OC_FileProxy{ if(in_array($user, $this->userQuota)) { return $this->userQuota[$user]; } - $userQuota=OC_Preferences::getValue($user,'files','quota','default'); + $userQuota=OC_Preferences::getValue($user, 'files', 'quota', 'default'); if($userQuota=='default') { - $userQuota=OC_AppConfig::getValue('files','default_quota','none'); + $userQuota=OC_AppConfig::getValue('files', 'default_quota', 'none'); } if($userQuota=='none') { $this->userQuota[$user]=0; @@ -77,33 +77,33 @@ class OC_FileProxy_Quota extends OC_FileProxy{ return $totalSpace-$usedSpace; } - public function postFree_space($path,$space) { + public function postFree_space($path, $space) { $free=$this->getFreeSpace($path); if($free==0) { return $space; } - return min($free,$space); + return min($free, $space); } - public function preFile_put_contents($path,$data) { + public function preFile_put_contents($path, $data) { if (is_resource($data)) { $data = '';//TODO: find a way to get the length of the stream without emptying it } return (strlen($data)<$this->getFreeSpace($path) or $this->getFreeSpace($path)==0); } - public function preCopy($path1,$path2) { - if(!self::$rootView){ + public function preCopy($path1, $path2) { + if(!self::$rootView) { self::$rootView = new OC_FilesystemView(''); } return (self::$rootView->filesize($path1)<$this->getFreeSpace($path2) or $this->getFreeSpace($path2)==0); } - public function preFromTmpFile($tmpfile,$path) { + public function preFromTmpFile($tmpfile, $path) { return (filesize($tmpfile)<$this->getFreeSpace($path) or $this->getFreeSpace($path)==0); } - public function preFromUploadedFile($tmpfile,$path) { + public function preFromUploadedFile($tmpfile, $path) { return (filesize($tmpfile)<$this->getFreeSpace($path) or $this->getFreeSpace($path)==0); } } diff --git a/lib/files.php b/lib/files.php index b4d4de1c995..3e15c68d885 100644 --- a/lib/files.php +++ b/lib/files.php @@ -45,13 +45,16 @@ class OC_Files { if (($path == '/Shared' || substr($path, 0, 8) == '/Shared/') && OC_App::isEnabled('files_sharing')) { if ($path == '/Shared') { list($info) = OCP\Share::getItemsSharedWith('file', OC_Share_Backend_File::FORMAT_FILE_APP_ROOT); - }else{ - $info['size'] = OC_Filesystem::filesize($path); - $info['mtime'] = OC_Filesystem::filemtime($path); - $info['ctime'] = OC_Filesystem::filectime($path); - $info['mimetype'] = OC_Filesystem::getMimeType($path); - $info['encrypted'] = false; - $info['versioned'] = false; + } else { + $info = array(); + if (OC_Filesystem::file_exists($path)) { + $info['size'] = OC_Filesystem::filesize($path); + $info['mtime'] = OC_Filesystem::filemtime($path); + $info['ctime'] = OC_Filesystem::filectime($path); + $info['mimetype'] = OC_Filesystem::getMimeType($path); + $info['encrypted'] = false; + $info['versioned'] = false; + } } } else { $info = OC_FileCache::get($path); @@ -135,7 +138,7 @@ class OC_Files { * @param file $file ; seperated list of files to download * @param boolean $only_header ; boolean to only send header of the request */ - public static function get($dir,$files, $only_header = false) { + public static function get($dir, $files, $only_header = false) { if(strpos($files, ';')) { $files=explode(';', $files); } @@ -224,7 +227,7 @@ class OC_Files { } } - public static function zipAddDir($dir,$zip,$internalDir='') { + public static function zipAddDir($dir, $zip, $internalDir='') { $dirname=basename($dir); $zip->addEmptyDir($internalDir.$dirname); $internalDir.=$dirname.='/'; @@ -249,7 +252,7 @@ class OC_Files { * @param dir $targetDir * @param file $target */ - public static function move($sourceDir,$source,$targetDir,$target) { + public static function move($sourceDir, $source, $targetDir, $target) { if(OC_User::isLoggedIn() && ($sourceDir != '' || $source != 'Shared')) { $targetFile=self::normalizePath($targetDir.'/'.$target); $sourceFile=self::normalizePath($sourceDir.'/'.$source); @@ -267,7 +270,7 @@ class OC_Files { * @param dir $targetDir * @param file $target */ - public static function copy($sourceDir,$source,$targetDir,$target) { + public static function copy($sourceDir, $source, $targetDir, $target) { if(OC_User::isLoggedIn()) { $targetFile=$targetDir.'/'.$target; $sourceFile=$sourceDir.'/'.$source; @@ -282,7 +285,7 @@ class OC_Files { * @param file $name * @param type $type */ - public static function newFile($dir,$name,$type) { + public static function newFile($dir, $name, $type) { if(OC_User::isLoggedIn()) { $file=$dir.'/'.$name; if($type=='dir') { @@ -305,7 +308,7 @@ class OC_Files { * @param dir $dir * @param file $name */ - public static function delete($dir,$file) { + public static function delete($dir, $file) { if(OC_User::isLoggedIn() && ($dir!= '' || $file != 'Shared')) { $file=$dir.'/'.$file; return OC_Filesystem::unlink($file); @@ -389,9 +392,9 @@ class OC_Files { * @param string file * @return string guessed mime type */ - static function pull($source,$token,$dir,$file) { + static function pull($source, $token, $dir, $file) { $tmpfile=tempnam(get_temp_dir(), 'remoteCloudFile'); - $fp=fopen($tmpfile,'w+'); + $fp=fopen($tmpfile, 'w+'); $url=$source.="/files/pull.php?token=$token"; $ch=curl_init(); curl_setopt($ch, CURLOPT_URL, $url); @@ -480,7 +483,7 @@ class OC_Files { } } -function fileCmp($a,$b) { +function fileCmp($a, $b) { if($a['type']=='dir' and $b['type']!='dir') { return -1; }elseif($a['type']!='dir' and $b['type']=='dir') { diff --git a/lib/filestorage.php b/lib/filestorage.php index 146cecf4efa..dd65f4421b7 100644 --- a/lib/filestorage.php +++ b/lib/filestorage.php @@ -42,13 +42,13 @@ abstract class OC_Filestorage{ abstract public function filectime($path); abstract public function filemtime($path); abstract public function file_get_contents($path); - abstract public function file_put_contents($path,$data); + abstract public function file_put_contents($path, $data); abstract public function unlink($path); - abstract public function rename($path1,$path2); - abstract public function copy($path1,$path2); - abstract public function fopen($path,$mode); + abstract public function rename($path1, $path2); + abstract public function copy($path1, $path2); + abstract public function fopen($path, $mode); abstract public function getMimeType($path); - abstract public function hash($type,$path,$raw = false); + abstract public function hash($type, $path, $raw = false); abstract public function free_space($path); abstract public function search($query); abstract public function touch($path, $mtime=null); @@ -62,6 +62,6 @@ abstract class OC_Filestorage{ * hasUpdated for folders should return at least true if a file inside the folder is add, removed or renamed. * returning true for other changes in the folder is optional */ - abstract public function hasUpdated($path,$time); + abstract public function hasUpdated($path, $time); abstract public function getOwner($path); } diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php index f24a5704913..b97eb79d8d4 100644 --- a/lib/filestorage/common.php +++ b/lib/filestorage/common.php @@ -89,25 +89,25 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { } return fread($handle, $size); } - public function file_put_contents($path,$data) { + public function file_put_contents($path, $data) { $handle = $this->fopen($path, "w"); return fwrite($handle, $data); } // abstract public function unlink($path); - public function rename($path1,$path2) { - if($this->copy($path1,$path2)) { + public function rename($path1, $path2) { + if($this->copy($path1, $path2)) { return $this->unlink($path1); }else{ return false; } } - public function copy($path1,$path2) { - $source=$this->fopen($path1,'r'); - $target=$this->fopen($path2,'w'); - $count=OC_Helper::streamCopy($source,$target); + public function copy($path1, $path2) { + $source=$this->fopen($path1, 'r'); + $target=$this->fopen($path2, 'w'); + $count=OC_Helper::streamCopy($source, $target); return $count>0; } -// abstract public function fopen($path,$mode); +// abstract public function fopen($path, $mode); /** * @brief Deletes all files and folders recursively within a directory @@ -188,25 +188,25 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { if($this->is_dir($path)) { return 'httpd/unix-directory'; } - $source=$this->fopen($path,'r'); + $source=$this->fopen($path, 'r'); if(!$source) { return false; } - $head=fread($source,8192);//8kb should suffice to determine a mimetype - if($pos=strrpos($path,'.')) { - $extension=substr($path,$pos); + $head=fread($source, 8192);//8kb should suffice to determine a mimetype + if($pos=strrpos($path, '.')) { + $extension=substr($path, $pos); }else{ $extension=''; } $tmpFile=OC_Helper::tmpFile($extension); - file_put_contents($tmpFile,$head); + file_put_contents($tmpFile, $head); $mime=OC_Helper::getMimeType($tmpFile); unlink($tmpFile); return $mime; } - public function hash($type,$path,$raw = false) { + public function hash($type, $path, $raw = false) { $tmpFile=$this->getLocalFile(); - $hash=hash($type,$tmpFile,$raw); + $hash=hash($type, $tmpFile, $raw); unlink($tmpFile); return $hash; } @@ -218,35 +218,35 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { return $this->toTmpFile($path); } private function toTmpFile($path) {//no longer in the storage api, still usefull here - $source=$this->fopen($path,'r'); + $source=$this->fopen($path, 'r'); if(!$source) { return false; } - if($pos=strrpos($path,'.')) { - $extension=substr($path,$pos); + if($pos=strrpos($path, '.')) { + $extension=substr($path, $pos); }else{ $extension=''; } $tmpFile=OC_Helper::tmpFile($extension); - $target=fopen($tmpFile,'w'); - OC_Helper::streamCopy($source,$target); + $target=fopen($tmpFile, 'w'); + OC_Helper::streamCopy($source, $target); return $tmpFile; } public function getLocalFolder($path) { $baseDir=OC_Helper::tmpFolder(); - $this->addLocalFolder($path,$baseDir); + $this->addLocalFolder($path, $baseDir); return $baseDir; } - private function addLocalFolder($path,$target) { + private function addLocalFolder($path, $target) { if($dh=$this->opendir($path)) { while($file=readdir($dh)) { if($file!=='.' and $file!=='..') { if($this->is_dir($path.'/'.$file)) { mkdir($target.'/'.$file); - $this->addLocalFolder($path.'/'.$file,$target.'/'.$file); + $this->addLocalFolder($path.'/'.$file, $target.'/'.$file); }else{ $tmp=$this->toTmpFile($path.'/'.$file); - rename($tmp,$target.'/'.$file); + rename($tmp, $target.'/'.$file); } } } @@ -254,7 +254,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { } // abstract public function touch($path, $mtime=null); - protected function searchInDir($query,$dir='') { + protected function searchInDir($query, $dir='') { $files=array(); $dh=$this->opendir($dir); if($dh) { @@ -264,7 +264,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { $files[]=$dir.'/'.$item; } if($this->is_dir($dir.'/'.$item)) { - $files=array_merge($files,$this->searchInDir($query,$dir.'/'.$item)); + $files=array_merge($files, $this->searchInDir($query, $dir.'/'.$item)); } } } @@ -276,7 +276,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { * @param int $time * @return bool */ - public function hasUpdated($path,$time) { + public function hasUpdated($path, $time) { return $this->filemtime($path)>$time; } diff --git a/lib/filestorage/commontest.php b/lib/filestorage/commontest.php index b88bb232c36..3b038b3fda9 100644 --- a/lib/filestorage/commontest.php +++ b/lib/filestorage/commontest.php @@ -63,13 +63,13 @@ class OC_Filestorage_CommonTest extends OC_Filestorage_Common{ public function unlink($path) { return $this->storage->unlink($path); } - public function fopen($path,$mode) { - return $this->storage->fopen($path,$mode); + public function fopen($path, $mode) { + return $this->storage->fopen($path, $mode); } public function free_space($path) { return $this->storage->free_space($path); } public function touch($path, $mtime=null) { - return $this->storage->touch($path,$mtime); + return $this->storage->touch($path, $mtime); } }
\ No newline at end of file diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php index 731ac4a3c72..6fe45acf8c5 100644 --- a/lib/filestorage/local.php +++ b/lib/filestorage/local.php @@ -6,7 +6,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ protected $datadir; public function __construct($arguments) { $this->datadir=$arguments['datadir']; - if(substr($this->datadir,-1)!=='/') { + if(substr($this->datadir, -1)!=='/') { $this->datadir.='/'; } } @@ -20,8 +20,8 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ return opendir($this->datadir.$path); } public function is_dir($path) { - if(substr($path,-1)=='/') { - $path=substr($path,0,-1); + if(substr($path, -1)=='/') { + $path=substr($path, 0, -1); } return is_dir($this->datadir.$path); } @@ -78,38 +78,38 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ public function file_get_contents($path) { return file_get_contents($this->datadir.$path); } - public function file_put_contents($path,$data) { - return file_put_contents($this->datadir.$path,$data); + public function file_put_contents($path, $data) { + return file_put_contents($this->datadir.$path, $data); } public function unlink($path) { return $this->delTree($path); } - public function rename($path1,$path2) { + public function rename($path1, $path2) { if (!$this->isUpdatable($path1)) { - OC_Log::write('core','unable to rename, file is not writable : '.$path1,OC_Log::ERROR); + OC_Log::write('core', 'unable to rename, file is not writable : '.$path1, OC_Log::ERROR); return false; } if(! $this->file_exists($path1)) { - OC_Log::write('core','unable to rename, file does not exists : '.$path1,OC_Log::ERROR); + OC_Log::write('core', 'unable to rename, file does not exists : '.$path1, OC_Log::ERROR); return false; } - if($return=rename($this->datadir.$path1,$this->datadir.$path2)) { + if($return=rename($this->datadir.$path1, $this->datadir.$path2)) { } return $return; } - public function copy($path1,$path2) { + public function copy($path1, $path2) { if($this->is_dir($path2)) { if(!$this->file_exists($path2)) { $this->mkdir($path2); } - $source=substr($path1, strrpos($path1,'/')+1); + $source=substr($path1, strrpos($path1, '/')+1); $path2.=$source; } - return copy($this->datadir.$path1,$this->datadir.$path2); + return copy($this->datadir.$path1, $this->datadir.$path2); } - public function fopen($path,$mode) { - if($return=fopen($this->datadir.$path,$mode)) { + public function fopen($path, $mode) { + if($return=fopen($this->datadir.$path, $mode)) { switch($mode) { case 'r': break; @@ -156,8 +156,8 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ return $return; } - public function hash($path,$type,$raw=false) { - return hash_file($type,$this->datadir.$path,$raw); + public function hash($path, $type, $raw=false) { + return hash_file($type, $this->datadir.$path, $raw); } public function free_space($path) { @@ -174,7 +174,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ return $this->datadir.$path; } - protected function searchInDir($query,$dir='') { + protected function searchInDir($query, $dir='') { $files=array(); foreach (scandir($this->datadir.$dir) as $item) { if ($item == '.' || $item == '..') continue; @@ -182,7 +182,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ $files[]=$dir.'/'.$item; } if(is_dir($this->datadir.$dir.'/'.$item)) { - $files=array_merge($files,$this->searchInDir($query,$dir.'/'.$item)); + $files=array_merge($files, $this->searchInDir($query, $dir.'/'.$item)); } } return $files; @@ -193,7 +193,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ * @param int $time * @return bool */ - public function hasUpdated($path,$time) { + public function hasUpdated($path, $time) { return $this->filemtime($path)>$time; } } diff --git a/lib/filesystem.php b/lib/filesystem.php index 3b6772c9849..4635f8b4f30 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -35,10 +35,10 @@ * post_create(path) * delete(path, &run) * post_delete(path) - * rename(oldpath,newpath, &run) - * post_rename(oldpath,newpath) - * copy(oldpath,newpath, &run) (if the newpath doesn't exists yes, copy, create and write will be emited in that order) - * post_rename(oldpath,newpath) + * rename(oldpath, newpath, &run) + * post_rename(oldpath, newpath) + * copy(oldpath, newpath, &run) (if the newpath doesn't exists yes, copy, create and write will be emited in that order) + * post_rename(oldpath, newpath) * * the &run parameter can be set to false to prevent the operation from occuring */ @@ -209,48 +209,48 @@ class OC_Filesystem{ } static private function loadSystemMountPoints($user) { - if(is_file(OC::$SERVERROOT.'/config/mount.php')) {
- $mountConfig=include OC::$SERVERROOT.'/config/mount.php';
- if(isset($mountConfig['global'])) {
- foreach($mountConfig['global'] as $mountPoint=>$options) {
- self::mount($options['class'], $options['options'], $mountPoint);
- }
- }
-
- if(isset($mountConfig['group'])) {
- foreach($mountConfig['group'] as $group=>$mounts) {
- if(OC_Group::inGroup($user, $group)) {
- foreach($mounts as $mountPoint=>$options) {
- $mountPoint=self::setUserVars($mountPoint, $user);
- foreach($options as &$option) {
- $option=self::setUserVars($option, $user);
- }
- self::mount($options['class'], $options['options'], $mountPoint);
- }
- }
- }
- }
-
- if(isset($mountConfig['user'])) {
- foreach($mountConfig['user'] as $user=>$mounts) {
- if($user==='all' or strtolower($user)===strtolower($user)) {
- foreach($mounts as $mountPoint=>$options) {
- $mountPoint=self::setUserVars($mountPoint, $user);
- foreach($options as &$option) {
- $option=self::setUserVars($option, $user);
- }
- self::mount($options['class'], $options['options'], $mountPoint);
- }
- }
- }
- }
-
- $mtime=filemtime(OC::$SERVERROOT.'/config/mount.php');
- $previousMTime=OC_Appconfig::getValue('files','mountconfigmtime',0);
- if($mtime>$previousMTime) {//mount config has changed, filecache needs to be updated
- OC_FileCache::triggerUpdate();
- OC_Appconfig::setValue('files', 'mountconfigmtime', $mtime);
- }
+ if(is_file(OC::$SERVERROOT.'/config/mount.php')) { + $mountConfig=include OC::$SERVERROOT.'/config/mount.php'; + if(isset($mountConfig['global'])) { + foreach($mountConfig['global'] as $mountPoint=>$options) { + self::mount($options['class'], $options['options'], $mountPoint); + } + } + + if(isset($mountConfig['group'])) { + foreach($mountConfig['group'] as $group=>$mounts) { + if(OC_Group::inGroup($user, $group)) { + foreach($mounts as $mountPoint=>$options) { + $mountPoint=self::setUserVars($mountPoint, $user); + foreach($options as &$option) { + $option=self::setUserVars($option, $user); + } + self::mount($options['class'], $options['options'], $mountPoint); + } + } + } + } + + if(isset($mountConfig['user'])) { + foreach($mountConfig['user'] as $user=>$mounts) { + if($user==='all' or strtolower($user)===strtolower($user)) { + foreach($mounts as $mountPoint=>$options) { + $mountPoint=self::setUserVars($mountPoint, $user); + foreach($options as &$option) { + $option=self::setUserVars($option, $user); + } + self::mount($options['class'], $options['options'], $mountPoint); + } + } + } + } + + $mtime=filemtime(OC::$SERVERROOT.'/config/mount.php'); + $previousMTime=OC_Appconfig::getValue('files', 'mountconfigmtime', 0); + if($mtime>$previousMTime) {//mount config has changed, filecache needs to be updated + OC_FileCache::triggerUpdate(); + OC_Appconfig::setValue('files', 'mountconfigmtime', $mtime); + } } } @@ -303,7 +303,7 @@ class OC_Filesystem{ * @param array arguments * @return OC_Filestorage */ - static private function createStorage($class,$arguments) { + static private function createStorage($class, $arguments) { if(class_exists($class)) { try { return new $class($arguments); @@ -312,7 +312,7 @@ class OC_Filesystem{ return false; } }else{ - OC_Log::write('core','storage backend '.$class.' not found',OC_Log::ERROR); + OC_Log::write('core', 'storage backend '.$class.' not found', OC_Log::ERROR); return false; } } @@ -349,14 +349,14 @@ class OC_Filesystem{ * @param OC_Filestorage storage * @param string mountpoint */ - static public function mount($class,$arguments,$mountpoint) { + static public function mount($class, $arguments, $mountpoint) { if($mountpoint[0]!='/') { $mountpoint='/'.$mountpoint; } if(substr($mountpoint, -1)!=='/') { $mountpoint=$mountpoint.'/'; } - self::$mounts[$mountpoint]=array('class'=>$class,'arguments'=>$arguments); + self::$mounts[$mountpoint]=array('class'=>$class, 'arguments'=>$arguments); } /** @@ -396,12 +396,16 @@ class OC_Filesystem{ * @return bool */ static public function isValidPath($path) { + $path = self::normalizePath($path); if(!$path || $path[0]!=='/') { $path='/'.$path; } if(strstr($path, '/../') || strrchr($path, '/') === '/..' ) { return false; } + if(self::isFileBlacklisted($path)) { + return false; + } return true; } @@ -411,20 +415,22 @@ class OC_Filesystem{ * @param array $data from hook */ static public function isBlacklisted($data) { - $blacklist = array('.htaccess'); if (isset($data['path'])) { $path = $data['path']; } else if (isset($data['newpath'])) { $path = $data['newpath']; } if (isset($path)) { - $filename = strtolower(basename($path)); - if (in_array($filename, $blacklist)) { - $data['run'] = false; - } + $data['run'] = !self::isFileBlacklisted($path); } } + static public function isFileBlacklisted($path) { + $blacklist = array('.htaccess'); + $filename = strtolower(basename($path)); + return in_array($filename, $blacklist); + } + /** * following functions are equivilent to their php buildin equivilents for arguments/return values. */ @@ -500,32 +506,32 @@ class OC_Filesystem{ static public function file_get_contents($path) { return self::$defaultInstance->file_get_contents($path); } - static public function file_put_contents($path,$data) { + static public function file_put_contents($path, $data) { return self::$defaultInstance->file_put_contents($path, $data); } static public function unlink($path) { return self::$defaultInstance->unlink($path); } - static public function rename($path1,$path2) { + static public function rename($path1, $path2) { return self::$defaultInstance->rename($path1, $path2); } - static public function copy($path1,$path2) { + static public function copy($path1, $path2) { return self::$defaultInstance->copy($path1, $path2); } - static public function fopen($path,$mode) { + static public function fopen($path, $mode) { return self::$defaultInstance->fopen($path, $mode); } static public function toTmpFile($path) { return self::$defaultInstance->toTmpFile($path); } - static public function fromTmpFile($tmpFile,$path) { + static public function fromTmpFile($tmpFile, $path) { return self::$defaultInstance->fromTmpFile($tmpFile, $path); } static public function getMimeType($path) { return self::$defaultInstance->getMimeType($path); } - static public function hash($type,$path, $raw = false) { + static public function hash($type, $path, $raw = false) { return self::$defaultInstance->hash($type, $path, $raw); } @@ -542,7 +548,7 @@ class OC_Filesystem{ * @param int $time * @return bool */ - static public function hasUpdated($path,$time) { + static public function hasUpdated($path, $time) { return self::$defaultInstance->hasUpdated($path, $time); } @@ -569,7 +575,7 @@ class OC_Filesystem{ * @param bool $stripTrailingSlash * @return string */ - public static function normalizePath($path,$stripTrailingSlash=true) { + public static function normalizePath($path, $stripTrailingSlash=true) { if($path=='') { return '/'; } @@ -584,7 +590,7 @@ class OC_Filesystem{ $path=substr($path, 0, -1); } //remove duplicate slashes - while(strpos($path,'//')!==false) { + while(strpos($path, '//')!==false) { $path=str_replace('//', '/', $path); } //normalize unicode if possible diff --git a/lib/filesystemview.php b/lib/filesystemview.php index 872da992fab..936e1feb412 100644 --- a/lib/filesystemview.php +++ b/lib/filesystemview.php @@ -142,7 +142,7 @@ class OC_FilesystemView { * @return string */ public function getLocalFile($path) { - $parent=substr($path, 0, strrpos($path,'/')); + $parent=substr($path, 0, strrpos($path, '/')); if(OC_Filesystem::isValidPath($parent) and $storage=$this->getStorage($path)) { return $storage->getLocalFile($this->getInternalPath($path)); } @@ -152,7 +152,7 @@ class OC_FilesystemView { * @return string */ public function getLocalFolder($path) { - $parent=substr($path, 0, strrpos($path,'/')); + $parent=substr($path, 0, strrpos($path, '/')); if(OC_Filesystem::isValidPath($parent) and $storage=$this->getStorage($path)) { return $storage->getLocalFolder($this->getInternalPath($path)); } @@ -215,13 +215,13 @@ class OC_FilesystemView { * @deprecated Replaced by isReadable() as part of CRUDS */ public function is_readable($path) { - return $this->basicOperation('isReadable',$path); + return $this->basicOperation('isReadable', $path); } /** * @deprecated Replaced by isCreatable(), isUpdatable(), isDeletable() as part of CRUDS */ public function is_writable($path) { - return $this->basicOperation('isUpdatable',$path); + return $this->basicOperation('isUpdatable', $path); } public function isCreatable($path) { return $this->basicOperation('isCreatable', $path); @@ -251,7 +251,7 @@ class OC_FilesystemView { return $this->basicOperation('filemtime', $path); } public function touch($path, $mtime=null) { - if(!is_null($mtime) and !is_numeric($mtime)){ + if(!is_null($mtime) and !is_numeric($mtime)) { $mtime = strtotime($mtime); } return $this->basicOperation('touch', $path, array('write'), $mtime); @@ -266,7 +266,7 @@ class OC_FilesystemView { $path = $this->getRelativePath($absolutePath); $exists = $this->file_exists($path); $run = true; - if( $this->fakeRoot==OC_Filesystem::getRoot() ){ + if( $this->fakeRoot==OC_Filesystem::getRoot() ) { if(!$exists) { OC_Hook::emit( OC_Filesystem::CLASSNAME, @@ -294,7 +294,7 @@ class OC_FilesystemView { $count=OC_Helper::streamCopy($data, $target); fclose($target); fclose($data); - if( $this->fakeRoot==OC_Filesystem::getRoot() ){ + if( $this->fakeRoot==OC_Filesystem::getRoot() ) { if(!$exists) { OC_Hook::emit( OC_Filesystem::CLASSNAME, @@ -325,8 +325,8 @@ class OC_FilesystemView { return $this->basicOperation( 'deleteAll', $directory, array('delete'), $empty ); } public function rename($path1, $path2) { - $postFix1=(substr($path1,-1,1)==='/')?'/':''; - $postFix2=(substr($path2,-1,1)==='/')?'/':''; + $postFix1=(substr($path1, -1, 1)==='/')?'/':''; + $postFix2=(substr($path2, -1, 1)==='/')?'/':''; $absolutePath1 = OC_Filesystem::normalizePath($this->getAbsolutePath($path1)); $absolutePath2 = OC_Filesystem::normalizePath($this->getAbsolutePath($path2)); if(OC_FileProxy::runPreProxies('rename', $absolutePath1, $absolutePath2) and OC_Filesystem::isValidPath($path2)) { @@ -337,7 +337,7 @@ class OC_FilesystemView { return false; } $run=true; - if( $this->fakeRoot==OC_Filesystem::getRoot() ){ + if( $this->fakeRoot==OC_Filesystem::getRoot() ) { OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_rename, array( @@ -362,7 +362,7 @@ class OC_FilesystemView { $storage1->unlink($this->getInternalPath($path1.$postFix1)); $result = $count>0; } - if( $this->fakeRoot==OC_Filesystem::getRoot() ){ + if( $this->fakeRoot==OC_Filesystem::getRoot() ) { OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_rename, @@ -377,8 +377,8 @@ class OC_FilesystemView { } } public function copy($path1, $path2) { - $postFix1=(substr($path1,-1,1)==='/')?'/':''; - $postFix2=(substr($path2,-1,1)==='/')?'/':''; + $postFix1=(substr($path1, -1, 1)==='/')?'/':''; + $postFix2=(substr($path2, -1, 1)==='/')?'/':''; $absolutePath1 = OC_Filesystem::normalizePath($this->getAbsolutePath($path1)); $absolutePath2 = OC_Filesystem::normalizePath($this->getAbsolutePath($path2)); if(OC_FileProxy::runPreProxies('copy', $absolutePath1, $absolutePath2) and OC_Filesystem::isValidPath($path2)) { @@ -389,7 +389,7 @@ class OC_FilesystemView { return false; } $run=true; - if( $this->fakeRoot==OC_Filesystem::getRoot() ){ + if( $this->fakeRoot==OC_Filesystem::getRoot() ) { OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_copy, @@ -433,7 +433,7 @@ class OC_FilesystemView { $target = $this->fopen($path2.$postFix2, 'w'); $result = OC_Helper::streamCopy($source, $target); } - if( $this->fakeRoot==OC_Filesystem::getRoot() ){ + if( $this->fakeRoot==OC_Filesystem::getRoot() ) { OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_copy, @@ -489,7 +489,7 @@ class OC_FilesystemView { $hooks[]='write'; break; default: - OC_Log::write('core','invalid mode ('.$mode.') for '.$path,OC_Log::ERROR); + OC_Log::write('core', 'invalid mode ('.$mode.') for '.$path, OC_Log::ERROR); } return $this->basicOperation('fopen', $path, $hooks, $mode); @@ -501,7 +501,7 @@ class OC_FilesystemView { $extension=''; $extOffset=strpos($path, '.'); if($extOffset !== false) { - $extension=substr($path, strrpos($path,'.')); + $extension=substr($path, strrpos($path, '.')); } $tmpFile = OC_Helper::tmpFile($extension); file_put_contents($tmpFile, $source); @@ -530,7 +530,7 @@ class OC_FilesystemView { return $this->basicOperation('getMimeType', $path); } public function hash($type, $path, $raw = false) { - $postFix=(substr($path,-1,1)==='/')?'/':''; + $postFix=(substr($path, -1, 1)==='/')?'/':''; $absolutePath = OC_Filesystem::normalizePath($this->getAbsolutePath($path)); if (OC_FileProxy::runPreProxies('hash', $absolutePath) && OC_Filesystem::isValidPath($path)) { $path = $this->getRelativePath($absolutePath); @@ -570,7 +570,7 @@ class OC_FilesystemView { * OC_Filestorage for delegation to a storage backend for execution */ private function basicOperation($operation, $path, $hooks=array(), $extraParam=null) { - $postFix=(substr($path,-1,1)==='/')?'/':''; + $postFix=(substr($path, -1, 1)==='/')?'/':''; $absolutePath = OC_Filesystem::normalizePath($this->getAbsolutePath($path)); if(OC_FileProxy::runPreProxies($operation, $absolutePath, $extraParam) and OC_Filesystem::isValidPath($path)) { $path = $this->getRelativePath($absolutePath); @@ -578,7 +578,7 @@ class OC_FilesystemView { return false; } $internalPath = $this->getInternalPath($path.$postFix); - $run=$this->runHooks($hooks,$path); + $run=$this->runHooks($hooks, $path); if($run and $storage = $this->getStorage($path.$postFix)) { if(!is_null($extraParam)) { $result = $storage->$operation($internalPath, $extraParam); @@ -588,7 +588,7 @@ class OC_FilesystemView { $result = OC_FileProxy::runPostProxies($operation, $this->getAbsolutePath($path), $result); if(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()) { if($operation!='fopen') {//no post hooks for fopen, the file stream is still open - $this->runHooks($hooks,$path, true); + $this->runHooks($hooks, $path, true); } } return $result; @@ -597,7 +597,7 @@ class OC_FilesystemView { return null; } - private function runHooks($hooks,$path,$post=false) { + private function runHooks($hooks, $path, $post=false) { $prefix=($post)?'post_':''; $run=true; if(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()) { diff --git a/lib/group.php b/lib/group.php index a89c6c55e36..ed9482418bd 100644 --- a/lib/group.php +++ b/lib/group.php @@ -139,7 +139,7 @@ class OC_Group { */ public static function inGroup( $uid, $gid ) { foreach(self::$_usedBackends as $backend) { - if($backend->inGroup($uid,$gid)) { + if($backend->inGroup($uid, $gid)) { return true; } } @@ -223,7 +223,7 @@ class OC_Group { public static function getUserGroups( $uid ) { $groups=array(); foreach(self::$_usedBackends as $backend) { - $groups=array_merge($backend->getUserGroups($uid),$groups); + $groups=array_merge($backend->getUserGroups($uid), $groups); } asort($groups); return $groups; diff --git a/lib/group/dummy.php b/lib/group/dummy.php index 8116dcbd675..9516fd52ff8 100644 --- a/lib/group/dummy.php +++ b/lib/group/dummy.php @@ -69,7 +69,7 @@ class OC_Group_Dummy extends OC_Group_Backend { */ public function inGroup($uid, $gid) { if(isset($this->groups[$gid])) { - return (array_search($uid,$this->groups[$gid])!==false); + return (array_search($uid, $this->groups[$gid])!==false); }else{ return false; } @@ -85,7 +85,7 @@ class OC_Group_Dummy extends OC_Group_Backend { */ public function addToGroup($uid, $gid) { if(isset($this->groups[$gid])) { - if(array_search($uid,$this->groups[$gid])===false) { + if(array_search($uid, $this->groups[$gid])===false) { $this->groups[$gid][]=$uid; return true; }else{ @@ -104,9 +104,9 @@ class OC_Group_Dummy extends OC_Group_Backend { * * removes the user from a group. */ - public function removeFromGroup($uid,$gid) { + public function removeFromGroup($uid, $gid) { if(isset($this->groups[$gid])) { - if(($index=array_search($uid,$this->groups[$gid]))!==false) { + if(($index=array_search($uid, $this->groups[$gid]))!==false) { unset($this->groups[$gid][$index]); }else{ return false; @@ -128,7 +128,7 @@ class OC_Group_Dummy extends OC_Group_Backend { $groups=array(); $allGroups=array_keys($this->groups); foreach($allGroups as $group) { - if($this->inGroup($uid,$group)) { + if($this->inGroup($uid, $group)) { $groups[]=$group; } } diff --git a/lib/group/example.php b/lib/group/example.php index 76d12629763..3519b9ed92f 100644 --- a/lib/group/example.php +++ b/lib/group/example.php @@ -73,7 +73,7 @@ abstract class OC_Group_Example { * * removes the user from a group. */ - abstract public static function removeFromGroup($uid,$gid); + abstract public static function removeFromGroup($uid, $gid); /** * @brief Get all groups a user belongs to diff --git a/lib/helper.php b/lib/helper.php index 060d887fd67..ed459dab624 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -203,7 +203,7 @@ class OC_Helper { return OC::$WEBROOT."/core/img/filetypes/$mimetype.png"; } //try only the first part of the filetype - $mimetype=substr($mimetype,0, strpos($mimetype,'-')); + $mimetype=substr($mimetype, 0, strpos($mimetype, '-')); if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )) { return OC::$WEBROOT."/core/img/filetypes/$mimetype.png"; } @@ -355,29 +355,29 @@ class OC_Helper { * does NOT work for ownClouds filesystem, use OC_FileSystem::getMimeType instead */ static function getMimeType($path) { - $isWrapped=(strpos($path,'://')!==false) and (substr($path,0,7)=='file://'); + $isWrapped=(strpos($path, '://')!==false) and (substr($path, 0, 7)=='file://'); if (@is_dir($path)) { // directories are easy return "httpd/unix-directory"; } - if(strpos($path,'.')) { + if(strpos($path, '.')) { //try to guess the type by the file extension if(!self::$mimetypes || self::$mimetypes != include 'mimetypes.list.php') { self::$mimetypes=include 'mimetypes.list.php'; } $extension=strtolower(strrchr(basename($path), ".")); - $extension=substr($extension,1);//remove leading . + $extension=substr($extension, 1);//remove leading . $mimeType=(isset(self::$mimetypes[$extension]))?self::$mimetypes[$extension]:'application/octet-stream'; }else{ $mimeType='application/octet-stream'; } if($mimeType=='application/octet-stream' and function_exists('finfo_open') and function_exists('finfo_file') and $finfo=finfo_open(FILEINFO_MIME)) { - $info = @strtolower(finfo_file($finfo,$path)); + $info = @strtolower(finfo_file($finfo, $path)); if($info) { - $mimeType=substr($info,0, strpos($info,';')); + $mimeType=substr($info, 0, strpos($info, ';')); } finfo_close($finfo); } @@ -412,8 +412,8 @@ class OC_Helper { return finfo_buffer($finfo, $data); }else{ $tmpFile=OC_Helper::tmpFile(); - $fh=fopen($tmpFile,'wb'); - fwrite($fh,$data,8024); + $fh=fopen($tmpFile, 'wb'); + fwrite($fh, $data, 8024); fclose($fh); $mime=self::getMimeType($tmpFile); unset($tmpFile); @@ -475,16 +475,16 @@ class OC_Helper { $dirs = explode(PATH_SEPARATOR, $path); // WARNING : We have to check if open_basedir is enabled : $obd = ini_get('open_basedir'); - if($obd != "none"){ + if($obd != "none") { $obd_values = explode(PATH_SEPARATOR, $obd); - if(count($obd_values) > 0 and $obd_values[0]){ + if(count($obd_values) > 0 and $obd_values[0]) { // open_basedir is in effect ! // We need to check if the program is in one of these dirs : $dirs = $obd_values; } } - foreach($dirs as $dir){ - foreach($exts as $ext){ + foreach($dirs as $dir) { + foreach($exts as $ext) { if($check_fn("$dir/$name".$ext)) return true; } @@ -498,13 +498,13 @@ class OC_Helper { * @param resource $target * @return int the number of bytes copied */ - public static function streamCopy($source,$target) { + public static function streamCopy($source, $target) { if(!$source or !$target) { return false; } $count=0; while(!feof($source)) { - $count+=fwrite($target, fread($source,8192)); + $count+=fwrite($target, fread($source, 8192)); } return $count; } @@ -518,7 +518,7 @@ class OC_Helper { */ public static function tmpFile($postfix='') { $file=get_temp_dir().'/'.md5(time().rand()).$postfix; - $fh=fopen($file,'w'); + $fh=fopen($file, 'w'); fclose($fh); self::$tmpFiles[]=$file; return $file; diff --git a/lib/image.php b/lib/image.php index 13460a13eb5..41cd9081690 100644 --- a/lib/image.php +++ b/lib/image.php @@ -244,7 +244,7 @@ class OC_Image { ob_start(); $res = imagepng($this->resource); if (!$res) { - OC_Log::write('core','OC_Image->data. Error getting image data.',OC_Log::ERROR); + OC_Log::write('core', 'OC_Image->data. Error getting image data.', OC_Log::ERROR); } return ob_get_clean(); } @@ -263,15 +263,15 @@ class OC_Image { */ public function getOrientation() { if(!is_callable('exif_read_data')) { - OC_Log::write('core','OC_Image->fixOrientation() Exif module not enabled.', OC_Log::DEBUG); + OC_Log::write('core', 'OC_Image->fixOrientation() Exif module not enabled.', OC_Log::DEBUG); return -1; } if(!$this->valid()) { - OC_Log::write('core','OC_Image->fixOrientation() No image loaded.', OC_Log::DEBUG); + OC_Log::write('core', 'OC_Image->fixOrientation() No image loaded.', OC_Log::DEBUG); return -1; } if(is_null($this->filepath) || !is_readable($this->filepath)) { - OC_Log::write('core','OC_Image->fixOrientation() No readable file path set.', OC_Log::DEBUG); + OC_Log::write('core', 'OC_Image->fixOrientation() No readable file path set.', OC_Log::DEBUG); return -1; } $exif = @exif_read_data($this->filepath, 'IFD0'); @@ -549,7 +549,7 @@ class OC_Image { public function preciseResize($width, $height) { if (!$this->valid()) { - OC_Log::write('core',__METHOD__.'(): No image loaded', OC_Log::ERROR); + OC_Log::write('core', __METHOD__.'(): No image loaded', OC_Log::ERROR); return false; } $width_orig=imageSX($this->resource); @@ -557,14 +557,14 @@ class OC_Image { $process = imagecreatetruecolor($width, $height); if ($process == false) { - OC_Log::write('core', __METHOD__.'(): Error creating true color image',OC_Log::ERROR); + OC_Log::write('core', __METHOD__.'(): Error creating true color image', OC_Log::ERROR); imagedestroy($process); return false; } imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $width, $height, $width_orig, $height_orig); if ($process == false) { - OC_Log::write('core', __METHOD__.'(): Error resampling process image '.$width.'x'.$height,OC_Log::ERROR); + OC_Log::write('core', __METHOD__.'(): Error resampling process image '.$width.'x'.$height, OC_Log::ERROR); imagedestroy($process); return false; } @@ -607,13 +607,13 @@ class OC_Image { } $process = imagecreatetruecolor($targetWidth, $targetHeight); if ($process == false) { - OC_Log::write('core', 'OC_Image->centerCrop. Error creating true color image',OC_Log::ERROR); + OC_Log::write('core', 'OC_Image->centerCrop. Error creating true color image', OC_Log::ERROR); imagedestroy($process); return false; } imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $targetWidth, $targetHeight, $width, $height); if ($process == false) { - OC_Log::write('core', 'OC_Image->centerCrop. Error resampling process image '.$width.'x'.$height,OC_Log::ERROR); + OC_Log::write('core', 'OC_Image->centerCrop. Error resampling process image '.$width.'x'.$height, OC_Log::ERROR); imagedestroy($process); return false; } @@ -637,13 +637,13 @@ class OC_Image { } $process = imagecreatetruecolor($w, $h); if ($process == false) { - OC_Log::write('core', __METHOD__.'(): Error creating true color image',OC_Log::ERROR); + OC_Log::write('core', __METHOD__.'(): Error creating true color image', OC_Log::ERROR); imagedestroy($process); return false; } imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $w, $h, $w, $h); if ($process == false) { - OC_Log::write('core', __METHOD__.'(): Error resampling process image '.$w.'x'.$h,OC_Log::ERROR); + OC_Log::write('core', __METHOD__.'(): Error resampling process image '.$w.'x'.$h, OC_Log::ERROR); imagedestroy($process); return false; } diff --git a/lib/installer.php b/lib/installer.php index 8c504fb6129..7dc8b0cef8d 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -57,7 +57,7 @@ class OC_Installer{ */ public static function installApp( $data = array()) { if(!isset($data['source'])) { - OC_Log::write('core','No source specified when installing app',OC_Log::ERROR); + OC_Log::write('core', 'No source specified when installing app', OC_Log::ERROR); return false; } @@ -65,13 +65,13 @@ class OC_Installer{ if($data['source']=='http') { $path=OC_Helper::tmpFile(); if(!isset($data['href'])) { - OC_Log::write('core','No href specified when installing app from http',OC_Log::ERROR); + OC_Log::write('core', 'No href specified when installing app from http', OC_Log::ERROR); return false; } - copy($data['href'],$path); + copy($data['href'], $path); }else{ if(!isset($data['path'])) { - OC_Log::write('core','No path specified when installing app from local file',OC_Log::ERROR); + OC_Log::write('core', 'No path specified when installing app from local file', OC_Log::ERROR); return false; } $path=$data['path']; @@ -80,13 +80,13 @@ class OC_Installer{ //detect the archive type $mime=OC_Helper::getMimeType($path); if($mime=='application/zip') { - rename($path,$path.'.zip'); + rename($path, $path.'.zip'); $path.='.zip'; }elseif($mime=='application/x-gzip') { - rename($path,$path.'.tgz'); + rename($path, $path.'.tgz'); $path.='.tgz'; }else{ - OC_Log::write('core','Archives of type '.$mime.' are not supported',OC_Log::ERROR); + OC_Log::write('core', 'Archives of type '.$mime.' are not supported', OC_Log::ERROR); return false; } @@ -248,7 +248,7 @@ class OC_Installer{ * -# including appinfo/upgrade.php * -# setting the installed version * - * upgrade.php can determine the current installed version of the app using "OC_Appconfig::getValue($appid,'installed_version')" + * upgrade.php can determine the current installed version of the app using "OC_Appconfig::getValue($appid, 'installed_version')" */ public static function upgradeApp( $data = array()) { // TODO: write function @@ -344,7 +344,7 @@ class OC_Installer{ * @param string $folder the folder of the app to check * @returns true for app is o.k. and false for app is not o.k. */ - public static function checkCode($appname,$folder) { + public static function checkCode($appname, $folder) { $blacklist=array( 'exec(', diff --git a/lib/json.php b/lib/json.php index cc6cee6caff..204430411c0 100644 --- a/lib/json.php +++ b/lib/json.php @@ -72,7 +72,7 @@ class OC_JSON{ public static function checkSubAdminUser() { self::checkLoggedIn(); self::verifyUser(); - if(!OC_Group::inGroup(OC_User::getUser(),'admin') && !OC_SubAdmin::isSubAdmin(OC_User::getUser())) { + if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isSubAdmin(OC_User::getUser())) { $l = OC_L10N::get('lib'); self::error(array( 'data' => array( 'message' => $l->t('Authentication error') ))); exit(); @@ -120,7 +120,7 @@ class OC_JSON{ /** * Encode and print $data in json format */ - public static function encodedPrint($data,$setContentType=true) { + public static function encodedPrint($data, $setContentType=true) { // Disable mimesniffing, don't move this to setContentTypeHeader! header( 'X-Content-Type-Options: nosniff' ); if($setContentType) { diff --git a/lib/l10n.php b/lib/l10n.php index f1a2523c307..f172710e5d7 100644 --- a/lib/l10n.php +++ b/lib/l10n.php @@ -68,14 +68,14 @@ class OC_L10N{ * get an L10N instance * @return OC_L10N */ - public static function get($app,$lang=null) { + public static function get($app, $lang=null) { if(is_null($lang)) { if(!isset(self::$instances[$app])) { self::$instances[$app]=new OC_L10N($app); } return self::$instances[$app]; }else{ - return new OC_L10N($app,$lang); + return new OC_L10N($app, $lang); } } @@ -167,7 +167,7 @@ class OC_L10N{ * */ public function tA($textArray) { - OC_Log::write('core', 'DEPRECATED: the method tA is deprecated and will be removed soon.',OC_Log::WARN); + OC_Log::write('core', 'DEPRECATED: the method tA is deprecated and will be removed soon.', OC_Log::WARN); $result = array(); foreach($textArray as $key => $text) { $result[$key] = (string)$this->t($text); diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php index 52d91d37655..041c66caed0 100644 --- a/lib/l10n/et_EE.php +++ b/lib/l10n/et_EE.php @@ -14,6 +14,7 @@ "Token expired. Please reload page." => "Kontrollkood aegus. Paelun lae leht uuesti.", "Files" => "Failid", "Text" => "Tekst", +"Images" => "Pildid", "seconds ago" => "sekundit tagasi", "1 minute ago" => "1 minut tagasi", "%d minutes ago" => "%d minutit tagasi", diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php index afb80288b53..ece05b389ca 100644 --- a/lib/l10n/nb_NO.php +++ b/lib/l10n/nb_NO.php @@ -14,6 +14,7 @@ "Token expired. Please reload page." => "Symbol utløpt. Vennligst last inn siden pÃ¥ nytt.", "Files" => "Filer", "Text" => "Tekst", +"Images" => "Bilder", "seconds ago" => "sekunder siden", "1 minute ago" => "1 minuitt siden", "%d minutes ago" => "%d minutter siden", diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php index 5eb2348100a..161a5bc0a68 100644 --- a/lib/l10n/pt_BR.php +++ b/lib/l10n/pt_BR.php @@ -14,6 +14,7 @@ "Token expired. Please reload page." => "Token expirou. Por favor recarregue a página.", "Files" => "Arquivos", "Text" => "Texto", +"Images" => "Imagens", "seconds ago" => "segundos atrás", "1 minute ago" => "1 minuto atrás", "%d minutes ago" => "%d minutos atrás", diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php index c703c30ac44..1a7319eb168 100644 --- a/lib/l10n/ru.php +++ b/lib/l10n/ru.php @@ -14,6 +14,7 @@ "Token expired. Please reload page." => "Токен проÑрочен. Перезагрузите Ñтраницу.", "Files" => "Файлы", "Text" => "ТекÑÑ‚", +"Images" => "ИзображениÑ", "seconds ago" => "менее минуты", "1 minute ago" => "1 минуту назад", "%d minutes ago" => "%d минут назад", diff --git a/lib/l10n/ru_RU.php b/lib/l10n/ru_RU.php index 36cc85e8d28..85bb278be5f 100644 --- a/lib/l10n/ru_RU.php +++ b/lib/l10n/ru_RU.php @@ -14,6 +14,7 @@ "Token expired. Please reload page." => "Маркер иÑтек. ПожалуйÑта, перезагрузите Ñтраницу.", "Files" => "Файлы", "Text" => "ТекÑÑ‚", +"Images" => "ИзображениÑ", "seconds ago" => "Ñекунд назад", "1 minute ago" => "1 минуту назад", "%d minutes ago" => "%d минут назад", diff --git a/lib/log.php b/lib/log.php index 3fc1e3976a1..e9cededa5c0 100644 --- a/lib/log.php +++ b/lib/log.php @@ -41,23 +41,23 @@ class OC_Log { } //Fatal errors handler - public static function onShutdown(){ + public static function onShutdown() { $error = error_get_last(); if($error) { //ob_end_clean(); self::write('PHP', $error['message'] . ' at ' . $error['file'] . '#' . $error['line'], self::FATAL); } else { - return true; + return true; } } // Uncaught exception handler - public static function onException($exception){ + public static function onException($exception) { self::write('PHP', $exception->getMessage() . ' at ' . $exception->getFile() . '#' . $exception->getLine(), self::FATAL); } //Recoverable errors handler - public static function onError($number, $message, $file, $line){ + public static function onError($number, $message, $file, $line) { if (error_reporting() === 0) { return; } diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php index d4644163ad5..ec43208d833 100644 --- a/lib/log/owncloud.php +++ b/lib/log/owncloud.php @@ -44,9 +44,9 @@ class OC_Log_Owncloud { * @param int level */ public static function write($app, $message, $level) { - $minLevel=min(OC_Config::getValue( "loglevel", OC_Log::WARN ),OC_Log::ERROR); + $minLevel=min(OC_Config::getValue( "loglevel", OC_Log::WARN ), OC_Log::ERROR); if($level>=$minLevel) { - $entry=array('app'=>$app, 'message'=>$message, 'level'=>$level,'time'=>time()); + $entry=array('app'=>$app, 'message'=>$message, 'level'=>$level, 'time'=>time()); $fh=fopen(self::$logFile, 'a'); fwrite($fh, json_encode($entry)."\n"); fclose($fh); diff --git a/lib/mail.php b/lib/mail.php index 8d30fff9f28..c78fcce88d4 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -27,7 +27,7 @@ class OC_Mail { * @param string $fromname * @param bool $html */ - public static function send($toaddress,$toname,$subject,$mailtext,$fromaddress,$fromname,$html=0,$altbody='',$ccaddress='',$ccname='',$bcc='') { + public static function send($toaddress,$toname,$subject,$mailtext,$fromaddress,$fromname,$html=0,$altbody='',$ccaddress='',$ccname='', $bcc='') { $SMTPMODE = OC_Config::getValue( 'mail_smtpmode', 'sendmail' ); $SMTPHOST = OC_Config::getValue( 'mail_smtphost', '127.0.0.1' ); @@ -56,13 +56,13 @@ class OC_Mail { $mailo->From =$fromaddress; $mailo->FromName = $fromname;; $mailo->Sender =$fromaddress; - $a=explode(' ',$toaddress); + $a=explode(' ', $toaddress); try { foreach($a as $ad) { - $mailo->AddAddress($ad,$toname); + $mailo->AddAddress($ad, $toname); } - if($ccaddress<>'') $mailo->AddCC($ccaddress,$ccname); + if($ccaddress<>'') $mailo->AddCC($ccaddress, $ccname); if($bcc<>'') $mailo->AddBCC($bcc); $mailo->AddReplyTo($fromaddress, $fromname); diff --git a/lib/migrate.php b/lib/migrate.php index 409d77a1a96..96f5a0001f7 100644 --- a/lib/migrate.php +++ b/lib/migrate.php @@ -91,7 +91,7 @@ class OC_Migrate{ if( self::$exporttype == 'user' ) { // Check user exists self::$uid = is_null($uid) ? OC_User::getUser() : $uid; - if(!OC_User::userExists(self::$uid)){ + if(!OC_User::userExists(self::$uid)) { return json_encode( array( 'success' => false) ); } } @@ -611,11 +611,11 @@ class OC_Migrate{ if( file_exists( $db ) ) { // Connect to the db if(!self::connectDB( $db )) { - OC_Log::write('migration','Failed to connect to migration.db',OC_Log::ERROR); + OC_Log::write('migration', 'Failed to connect to migration.db', OC_Log::ERROR); return false; } } else { - OC_Log::write('migration','Migration.db not found at: '.$db, OC_Log::FATAL ); + OC_Log::write('migration', 'Migration.db not found at: '.$db, OC_Log::FATAL ); return false; } diff --git a/lib/migration/content.php b/lib/migration/content.php index 87f8da68c9d..00df62f0c7f 100644 --- a/lib/migration/content.php +++ b/lib/migration/content.php @@ -53,7 +53,7 @@ class OC_Migration_Content{ if( !is_null( $this->db ) ) { // Get db path $db = $this->db->getDatabase(); - if(!in_array($db, $this->tmpfiles)){ + if(!in_array($db, $this->tmpfiles)) { $this->tmpfiles[] = $db; } } @@ -152,7 +152,7 @@ class OC_Migration_Content{ $sql = "INSERT INTO `" . $options['table'] . '` ( `'; $fieldssql = implode( '`, `', $fields ); $sql .= $fieldssql . "` ) VALUES( "; - $valuessql = substr( str_repeat( '?, ', count( $fields ) ),0,-2 ); + $valuessql = substr( str_repeat( '?, ', count( $fields ) ), 0, -2 ); $sql .= $valuessql . " )"; // Make the query $query = $this->prepare( $sql ); @@ -205,7 +205,7 @@ class OC_Migration_Content{ } closedir($dirhandle); } else { - OC_Log::write('admin_export',"Was not able to open directory: " . $dir,OC_Log::ERROR); + OC_Log::write('admin_export', "Was not able to open directory: " . $dir, OC_Log::ERROR); return false; } return true; diff --git a/lib/minimizer.php b/lib/minimizer.php index deffa8e65df..33106245963 100644 --- a/lib/minimizer.php +++ b/lib/minimizer.php @@ -48,11 +48,11 @@ abstract class OC_Minimizer { } if (!function_exists('gzdecode')) { - function gzdecode($data,$maxlength=null,&$filename='',&$error='') + function gzdecode($data, $maxlength=null, &$filename='', &$error='') { - if (strcmp(substr($data,0,9),"\x1f\x8b\x8\0\0\0\0\0\0")) { + if (strcmp(substr($data, 0, 9),"\x1f\x8b\x8\0\0\0\0\0\0")) { return null; // Not the GZIP format we expect (See RFC 1952) } - return gzinflate(substr($data,10,-8)); + return gzinflate(substr($data, 10, -8)); } } diff --git a/lib/ocsclient.php b/lib/ocsclient.php index 32c2cfe6e48..b6b5ad8f0a9 100644 --- a/lib/ocsclient.php +++ b/lib/ocsclient.php @@ -105,18 +105,18 @@ class OC_OCSClient{ * * This function returns a list of all the applications on the OCS server */ - public static function getApplications($categories,$page,$filter) { + public static function getApplications($categories, $page, $filter) { if(OC_Config::getValue('appstoreenabled', true)==false) { return(array()); } if(is_array($categories)) { - $categoriesstring=implode('x',$categories); + $categoriesstring=implode('x', $categories); }else{ $categoriesstring=$categories; } - $version='&version='.implode('x',\OC_Util::getVersion()); + $version='&version='.implode('x', \OC_Util::getVersion()); $filterurl='&filter='.urlencode($filter); $url=OC_OCSClient::getAppStoreURL().'/content/data?categories='.urlencode($categoriesstring).'&sortmode=new&page='.urlencode($page).'&pagesize=100'.$filterurl.$version; $apps=array(); @@ -162,7 +162,7 @@ class OC_OCSClient{ $xml=OC_OCSClient::getOCSresponse($url); if($xml==false) { - OC_Log::write('core','Unable to parse OCS content',OC_Log::FATAL); + OC_Log::write('core', 'Unable to parse OCS content', OC_Log::FATAL); return null; } $data=simplexml_load_string($xml); @@ -192,7 +192,7 @@ class OC_OCSClient{ * * This function returns an download url for an applications from the OCS server */ - public static function getApplicationDownload($id,$item) { + public static function getApplicationDownload($id, $item) { if(OC_Config::getValue('appstoreenabled', true)==false) { return null; } @@ -200,7 +200,7 @@ class OC_OCSClient{ $xml=OC_OCSClient::getOCSresponse($url); if($xml==false) { - OC_Log::write('core','Unable to parse OCS content',OC_Log::FATAL); + OC_Log::write('core', 'Unable to parse OCS content', OC_Log::FATAL); return null; } $data=simplexml_load_string($xml); @@ -222,7 +222,7 @@ class OC_OCSClient{ * * This function returns a list of all the knowledgebase entries from the OCS server */ - public static function getKnownledgebaseEntries($page,$pagesize,$search='') { + public static function getKnownledgebaseEntries($page, $pagesize, $search='') { if(OC_Config::getValue('knowledgebaseenabled', true)==false) { $kbe=array(); $kbe['totalitems']=0; @@ -238,7 +238,7 @@ class OC_OCSClient{ $xml=OC_OCSClient::getOCSresponse($url); if($xml==false) { - OC_Log::write('core','Unable to parse knowledgebase content',OC_Log::FATAL); + OC_Log::write('core', 'Unable to parse knowledgebase content', OC_Log::FATAL); return null; } $data=simplexml_load_string($xml); diff --git a/lib/preferences.php b/lib/preferences.php index b198a18415c..6270457834d 100644 --- a/lib/preferences.php +++ b/lib/preferences.php @@ -139,7 +139,7 @@ class OC_Preferences{ public static function setValue( $user, $app, $key, $value ) { // Check if the key does exist $query = OC_DB::prepare( 'SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?' ); - $values=$query->execute(array($user,$app,$key))->fetchAll(); + $values=$query->execute(array($user, $app, $key))->fetchAll(); $exists=(count($values)>0); if( !$exists ) { diff --git a/lib/public/backgroundjob.php b/lib/public/backgroundjob.php index 24a17836f7f..601046fe691 100644 --- a/lib/public/backgroundjob.php +++ b/lib/public/backgroundjob.php @@ -62,7 +62,7 @@ class BackgroundJob { * @param $type execution type * @return boolean * - * This method sets the execution type of the background jobs. Possible types + * This method sets the execution type of the background jobs. Possible types * are "none", "ajax", "webcron", "cron" */ public static function setExecutionType( $type ) { diff --git a/lib/public/db.php b/lib/public/db.php index 6ce62b27ca2..d2484b6eb83 100644 --- a/lib/public/db.php +++ b/lib/public/db.php @@ -42,7 +42,7 @@ class DB { * SQL query via MDB2 prepare(), needs to be execute()'d! */ static public function prepare( $query, $limit=null, $offset=null ) { - return(\OC_DB::prepare($query,$limit,$offset)); + return(\OC_DB::prepare($query, $limit, $offset)); } /** diff --git a/lib/public/share.php b/lib/public/share.php index da1c0616390..071304ec249 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -28,7 +28,7 @@ namespace OCP; /** * This class provides the ability for apps to share their content between users. * Apps must create a backend class that implements OCP\Share_Backend and register it with this class. -* +* * It provides the following hooks: * - post_shared */ diff --git a/lib/public/util.php b/lib/public/util.php index 38da7e82171..7b5b1abbded 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -61,7 +61,7 @@ class Util { */ public static function sendMail( $toaddress, $toname, $subject, $mailtext, $fromaddress, $fromname, $html=0, $altbody='', $ccaddress='', $ccname='', $bcc='') { // call the internal mail class - \OC_MAIL::send( $toaddress, $toname, $subject, $mailtext, $fromaddress, $fromname, $html=0, $altbody='', $ccaddress='', $ccname='', $bcc=''); + \OC_MAIL::send($toaddress, $toname, $subject, $mailtext, $fromaddress, $fromname, $html = 0, $altbody = '', $ccaddress = '', $ccname = '', $bcc = ''); } /** @@ -107,8 +107,8 @@ class Util { * @param int timestamp $timestamp * @param bool dateOnly option to ommit time from the result */ - public static function formatDate( $timestamp,$dateOnly=false) { - return(\OC_Util::formatDate( $timestamp,$dateOnly )); + public static function formatDate( $timestamp, $dateOnly=false) { + return(\OC_Util::formatDate( $timestamp, $dateOnly )); } /** diff --git a/lib/request.php b/lib/request.php index 87262d98625..287d20d1a5d 100644 --- a/lib/request.php +++ b/lib/request.php @@ -63,7 +63,7 @@ class OC_Request { $path_info = substr($_SERVER['REQUEST_URI'], strlen($_SERVER['SCRIPT_NAME'])); // following is taken from Sabre_DAV_URLUtil::decodePathSegment $path_info = rawurldecode($path_info); - $encoding = mb_detect_encoding($path_info, array('UTF-8','ISO-8859-1')); + $encoding = mb_detect_encoding($path_info, array('UTF-8', 'ISO-8859-1')); switch($encoding) { @@ -98,7 +98,7 @@ class OC_Request { $HTTP_ACCEPT_ENCODING = $_SERVER["HTTP_ACCEPT_ENCODING"]; if( strpos($HTTP_ACCEPT_ENCODING, 'x-gzip') !== false ) return 'x-gzip'; - else if( strpos($HTTP_ACCEPT_ENCODING,'gzip') !== false ) + else if( strpos($HTTP_ACCEPT_ENCODING, 'gzip') !== false ) return 'gzip'; return false; } diff --git a/lib/route.php b/lib/route.php index d5233d79861..5901717c094 100644 --- a/lib/route.php +++ b/lib/route.php @@ -108,7 +108,7 @@ class OC_Route extends Route { public function actionInclude($file) { $function = create_function('$param', 'unset($param["_route"]);' - .'$_GET=array_merge($_GET,$param);' + .'$_GET=array_merge($_GET, $param);' .'unset($param);' .'require_once "'.$file.'";'); $this->action($function); diff --git a/lib/router.php b/lib/router.php index 7bbc546d757..8cb8fd4f33b 100644 --- a/lib/router.php +++ b/lib/router.php @@ -34,7 +34,7 @@ class OC_Router { public function getRoutingFiles() { if (!isset($this->routing_files)) { $this->routing_files = array(); - foreach(OC_APP::getEnabledApps() as $app){ + foreach(OC_APP::getEnabledApps() as $app) { $file = OC_App::getAppPath($app).'/appinfo/routes.php'; if(file_exists($file)) { $this->routing_files[$app] = $file; diff --git a/lib/search.php b/lib/search.php index 0b6ad050024..3c3378ad13c 100644 --- a/lib/search.php +++ b/lib/search.php @@ -40,8 +40,8 @@ class OC_Search{ * register a new search provider to be used * @param string $provider class name of a OC_Search_Provider */ - public static function registerProvider($class,$options=array()) { - self::$registeredProviders[]=array('class'=>$class,'options'=>$options); + public static function registerProvider($class, $options=array()) { + self::$registeredProviders[]=array('class'=>$class, 'options'=>$options); } /** diff --git a/lib/search/result.php b/lib/search/result.php index 63b5cfabce6..08beaea151c 100644 --- a/lib/search/result.php +++ b/lib/search/result.php @@ -15,7 +15,7 @@ class OC_Search_Result{ * @param string $link link for the result * @param string $type the type of result as human readable string ('File', 'Music', etc) */ - public function __construct($name,$text,$link,$type) { + public function __construct($name, $text, $link, $type) { $this->name=$name; $this->text=$text; $this->link=$link; diff --git a/lib/setup.php b/lib/setup.php index 4e4a32e7362..726b3352d50 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -70,7 +70,7 @@ class OC_Setup { if(empty($options['dbname'])) { $error[] = "$dbprettyname enter the database name."; } - if(substr_count($options['dbname'], '.') >= 1){ + if(substr_count($options['dbname'], '.') >= 1) { $error[] = "$dbprettyname you may not use dots in the database name"; } if($dbtype != 'oci' && empty($options['dbhost'])) { @@ -95,7 +95,7 @@ class OC_Setup { //write the config file OC_Config::setValue('datadirectory', $datadir); OC_Config::setValue('dbtype', $dbtype); - OC_Config::setValue('version', implode('.',OC_Util::getVersion())); + OC_Config::setValue('version', implode('.', OC_Util::getVersion())); if($dbtype == 'mysql') { $dbuser = $options['dbuser']; $dbpass = $options['dbpass']; @@ -251,7 +251,7 @@ class OC_Setup { mysql_close($connection); } - private static function createMySQLDatabase($name,$user,$connection) { + private static function createMySQLDatabase($name, $user, $connection) { //we cant use OC_BD functions here because we need to connect as the administrative user. $query = "CREATE DATABASE IF NOT EXISTS `$name`"; $result = mysql_query($query, $connection); @@ -264,7 +264,7 @@ class OC_Setup { $result = mysql_query($query, $connection); //this query will fail if there aren't the right permissons, ignore the error } - private static function createDBUser($name,$password,$connection) { + private static function createDBUser($name, $password, $connection) { // we need to create 2 accounts, one for global use and one for local user. if we don't specify the local one, // the anonymous user would take precedence when there is one. $query = "CREATE USER '$name'@'localhost' IDENTIFIED BY '$password'"; @@ -339,7 +339,7 @@ class OC_Setup { } } - private static function pg_createDatabase($name,$user,$connection) { + private static function pg_createDatabase($name, $user, $connection) { //we cant use OC_BD functions here because we need to connect as the administrative user. $e_name = pg_escape_string($name); $e_user = pg_escape_string($user); @@ -364,7 +364,7 @@ class OC_Setup { $result = pg_query($connection, $query); } - private static function pg_createDBUser($name,$password,$connection) { + private static function pg_createDBUser($name, $password, $connection) { $e_name = pg_escape_string($name); $e_password = pg_escape_string($password); $query = "select * from pg_roles where rolname='$e_name';"; diff --git a/lib/streamwrappers.php b/lib/streamwrappers.php index 63b795f4c4d..981c280f0dd 100644 --- a/lib/streamwrappers.php +++ b/lib/streamwrappers.php @@ -5,7 +5,7 @@ class OC_FakeDirStream{ private $name; private $index; - public function dir_opendir($path,$options) { + public function dir_opendir($path, $options) { $this->name=substr($path, strlen('fakedir://')); $this->index=0; if(!isset(self::$dirs[$this->name])) { @@ -225,7 +225,7 @@ class OC_CloseStreamWrapper{ public function stream_open($path, $mode, $options, &$opened_path) { $path=substr($path, strlen('close://')); $this->path=$path; - $this->source=fopen($path,$mode); + $this->source=fopen($path, $mode); if(is_resource($this->source)) { $this->meta=stream_get_meta_data($this->source); } @@ -234,7 +234,7 @@ class OC_CloseStreamWrapper{ } public function stream_seek($offset, $whence=SEEK_SET) { - fseek($this->source,$offset,$whence); + fseek($this->source, $offset, $whence); } public function stream_tell() { @@ -242,23 +242,23 @@ class OC_CloseStreamWrapper{ } public function stream_read($count) { - return fread($this->source,$count); + return fread($this->source, $count); } public function stream_write($data) { - return fwrite($this->source,$data); + return fwrite($this->source, $data); } - public function stream_set_option($option,$arg1,$arg2) { + public function stream_set_option($option, $arg1, $arg2) { switch($option) { case STREAM_OPTION_BLOCKING: - stream_set_blocking($this->source,$arg1); + stream_set_blocking($this->source, $arg1); break; case STREAM_OPTION_READ_TIMEOUT: - stream_set_timeout($this->source,$arg1,$arg2); + stream_set_timeout($this->source, $arg1, $arg2); break; case STREAM_OPTION_WRITE_BUFFER: - stream_set_write_buffer($this->source,$arg1,$arg2); + stream_set_write_buffer($this->source, $arg1, $arg2); } } @@ -267,7 +267,7 @@ class OC_CloseStreamWrapper{ } public function stream_lock($mode) { - flock($this->source,$mode); + flock($this->source, $mode); } public function stream_flush() { @@ -290,7 +290,7 @@ class OC_CloseStreamWrapper{ public function stream_close() { fclose($this->source); if(isset(self::$callBacks[$this->path])) { - call_user_func(self::$callBacks[$this->path],$this->path); + call_user_func(self::$callBacks[$this->path], $this->path); } } diff --git a/lib/template.php b/lib/template.php index 1ad47cbe52c..3d3589abd1e 100644 --- a/lib/template.php +++ b/lib/template.php @@ -25,7 +25,7 @@ * Prints an XSS escaped string * @param string $string the string which will be escaped and printed */ -function p($string){ +function p($string) { print(OC_Util::sanitizeHTML($string)); } @@ -33,7 +33,7 @@ function p($string){ * Prints an unescaped string * @param string $string the string which will be printed as it is */ -function print_unescaped($string){ +function print_unescaped($string) { print($string); } @@ -85,7 +85,7 @@ function human_file_size( $bytes ) { } function simple_file_size($bytes) { - $mbytes = round($bytes/(1024*1024),1); + $mbytes = round($bytes/(1024*1024), 1); if($bytes == 0) { return '0'; } else if($mbytes < 0.1) { return '< 0.1'; } else if($mbytes > 1000) { return '> 1000'; } @@ -102,12 +102,12 @@ function relative_modified_date($timestamp) { if($timediff < 60) { return $l->t('seconds ago'); } else if($timediff < 120) { return $l->t('1 minute ago'); } - else if($timediff < 3600) { return $l->t('%d minutes ago',$diffminutes); } + else if($timediff < 3600) { return $l->t('%d minutes ago', $diffminutes); } //else if($timediff < 7200) { return '1 hour ago'; } //else if($timediff < 86400) { return $diffhours.' hours ago'; } else if((date('G')-$diffhours) > 0) { return $l->t('today'); } else if((date('G')-$diffhours) > -24) { return $l->t('yesterday'); } - else if($timediff < 2678400) { return $l->t('%d days ago',$diffdays); } + else if($timediff < 2678400) { return $l->t('%d days ago', $diffdays); } else if($timediff < 5184000) { return $l->t('last month'); } else if((date('n')-$diffmonths) > 0) { return $l->t('months ago'); } else if($timediff < 63113852) { return $l->t('last year'); } @@ -172,7 +172,6 @@ class OC_Template{ $this->application = $app; $this->vars = array(); $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]); @@ -196,11 +195,11 @@ class OC_Template{ public static function detectFormfactor() { // please add more useragent strings for other devices if(isset($_SERVER['HTTP_USER_AGENT'])) { - if(stripos($_SERVER['HTTP_USER_AGENT'],'ipad')>0) { + if(stripos($_SERVER['HTTP_USER_AGENT'], 'ipad')>0) { $mode='tablet'; - }elseif(stripos($_SERVER['HTTP_USER_AGENT'],'iphone')>0) { + }elseif(stripos($_SERVER['HTTP_USER_AGENT'], 'iphone')>0) { $mode='mobile'; - }elseif((stripos($_SERVER['HTTP_USER_AGENT'],'N9')>0) and (stripos($_SERVER['HTTP_USER_AGENT'],'nokia')>0)) { + }elseif((stripos($_SERVER['HTTP_USER_AGENT'], 'N9')>0) and (stripos($_SERVER['HTTP_USER_AGENT'], 'nokia')>0)) { $mode='mobile'; }else{ $mode='default'; @@ -357,7 +356,7 @@ class OC_Template{ * @param string $text the text content for the element */ public function addHeader( $tag, $attributes, $text='') { - $this->headers[]=array('tag'=>$tag,'attributes'=>$attributes,'text'=>$text); + $this->headers[]=array('tag'=>$tag,'attributes'=>$attributes, 'text'=>$text); } /** @@ -391,13 +390,12 @@ class OC_Template{ $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); + $page->assign('headers', $this->headers, false); foreach(OC_Util::$headers as $header) { - $page->append('headers',$header); + $page->append('headers', $header); } $page->assign( "content", $data, false ); diff --git a/lib/templatelayout.php b/lib/templatelayout.php index c3da172a7c1..1a0570a270d 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -12,10 +12,10 @@ class OC_TemplateLayout extends OC_Template { if( $renderas == 'user' ) { parent::__construct( 'core', 'layout.user' ); - if(in_array(OC_APP::getCurrentApp(), array('settings','admin','help'))!==false) { - $this->assign('bodyid','body-settings', false); + if(in_array(OC_APP::getCurrentApp(), array('settings','admin', 'help'))!==false) { + $this->assign('bodyid', 'body-settings', false); }else{ - $this->assign('bodyid','body-user', false); + $this->assign('bodyid', 'body-user', false); } // Add navigation entry diff --git a/lib/updater.php b/lib/updater.php index f55e55985d9..11081eded63 100644 --- a/lib/updater.php +++ b/lib/updater.php @@ -30,7 +30,7 @@ class OC_Updater{ */ public static function check() { OC_Appconfig::setValue('core', 'lastupdatedat', microtime(true)); - if(OC_Appconfig::getValue('core', 'installedat','')=='') OC_Appconfig::setValue('core', 'installedat', microtime(true)); + if(OC_Appconfig::getValue('core', 'installedat', '')=='') OC_Appconfig::setValue('core', 'installedat', microtime(true)); $updaterurl='http://apps.owncloud.com/updater.php'; $version=OC_Util::getVersion(); @@ -38,7 +38,7 @@ class OC_Updater{ $version['updated']=OC_Appconfig::getValue('core', 'lastupdatedat'); $version['updatechannel']='stable'; $version['edition']=OC_Util::getEditionString(); - $versionstring=implode('x',$version); + $versionstring=implode('x', $version); //fetch xml data from updater $url=$updaterurl.'?version='.$versionstring; diff --git a/lib/user.php b/lib/user.php index 869984a16eb..801ab7f608d 100644 --- a/lib/user.php +++ b/lib/user.php @@ -133,7 +133,7 @@ class OC_User { self::useBackend($backend); $_setupedBackends[]=$i; }else{ - OC_Log::write('core','User backend '.$class.' not found.',OC_Log::ERROR); + OC_Log::write('core', 'User backend '.$class.' not found.', OC_Log::ERROR); } } } @@ -179,7 +179,7 @@ class OC_User { if(!$backend->implementsActions(OC_USER_BACKEND_CREATE_USER)) continue; - $backend->createUser($uid,$password); + $backend->createUser($uid, $password); OC_Hook::emit( "OC_User", "post_createUser", array( "uid" => $uid, "password" => $password )); return true; @@ -329,7 +329,7 @@ class OC_User { foreach(self::$_usedBackends as $backend) { if($backend->implementsActions(OC_USER_BACKEND_SET_PASSWORD)) { if($backend->userExists($uid)) { - $success |= $backend->setPassword($uid,$password); + $success |= $backend->setPassword($uid, $password); } } } diff --git a/lib/user/database.php b/lib/user/database.php index 25e24fcf7e4..f33e338e2e4 100644 --- a/lib/user/database.php +++ b/lib/user/database.php @@ -48,7 +48,7 @@ class OC_User_Database extends OC_User_Backend { if(!self::$hasher) { //we don't want to use DES based crypt(), since it doesn't return a has with a recognisable prefix $forcePortable=(CRYPT_BLOWFISH!=1); - self::$hasher=new PasswordHash(8,$forcePortable); + self::$hasher=new PasswordHash(8, $forcePortable); } return self::$hasher; @@ -137,7 +137,7 @@ class OC_User_Database extends OC_User_Backend { }else{//old sha1 based hashing if(sha1($password)==$storedHash) { //upgrade to new hashing - $this->setPassword($row['uid'],$password); + $this->setPassword($row['uid'], $password); return $row['uid']; }else{ return false; @@ -155,7 +155,7 @@ class OC_User_Database extends OC_User_Backend { * Get a list of all users. */ public function getUsers($search = '', $limit = null, $offset = null) { - $query = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users` WHERE LOWER(`uid`) LIKE LOWER(?)',$limit,$offset); + $query = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users` WHERE LOWER(`uid`) LIKE LOWER(?)', $limit, $offset); $result = $query->execute(array($search.'%')); $users = array(); while ($row = $result->fetchRow()) { @@ -172,7 +172,10 @@ class OC_User_Database extends OC_User_Backend { public function userExists($uid) { $query = OC_DB::prepare( 'SELECT * FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)' ); $result = $query->execute( array( $uid )); - + if (OC_DB::isError($result)) { + OC_Log::write('core', OC_DB::getErrorMessage($result), OC_Log::ERROR); + return false; + } return $result->numRows() > 0; } diff --git a/lib/user/http.php b/lib/user/http.php index 2668341408d..944ede73a0b 100644 --- a/lib/user/http.php +++ b/lib/user/http.php @@ -40,7 +40,7 @@ class OC_User_HTTP extends OC_User_Backend { if(isset($parts['query'])) { $url.='?'.$parts['query']; } - return array($parts['user'],$url); + return array($parts['user'], $url); } @@ -50,7 +50,7 @@ class OC_User_HTTP extends OC_User_Backend { * @return boolean */ private function matchUrl($url) { - return ! is_null(parse_url($url,PHP_URL_USER)); + return ! is_null(parse_url($url, PHP_URL_USER)); } /** @@ -66,7 +66,7 @@ class OC_User_HTTP extends OC_User_Backend { if(!$this->matchUrl($uid)) { return false; } - list($user,$url)=$this->parseUrl($uid); + list($user, $url)=$this->parseUrl($uid); $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $url); diff --git a/lib/util.php b/lib/util.php index 789c75f4154..40b44bf9d6e 100755 --- a/lib/util.php +++ b/lib/util.php @@ -95,7 +95,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.90.0. This is not visible to the user - return array(4,91,00); + return array(4, 91, 00); } /** @@ -157,7 +157,7 @@ class OC_Util { * @param string $text the text content for the element */ public static function addHeader( $tag, $attributes, $text='') { - self::$headers[]=array('tag'=>$tag,'attributes'=>$attributes,'text'=>$text); + self::$headers[]=array('tag'=>$tag,'attributes'=>$attributes, 'text'=>$text); } /** @@ -166,7 +166,7 @@ class OC_Util { * @param int timestamp $timestamp * @param bool dateOnly option to ommit time from the result */ - public static function formatDate( $timestamp,$dateOnly=false) { + public static function formatDate( $timestamp, $dateOnly=false) { if(isset($_SESSION['timezone'])) {//adjust to clients timezone if we know it $systemTimeZone = intval(date('O')); $systemTimeZone=(round($systemTimeZone/100, 0)*60)+($systemTimeZone%100); @@ -186,7 +186,7 @@ class OC_Util { * @param string $url * @return OC_Template */ - public static function getPageNavi($pagecount,$page,$url) { + public static function getPageNavi($pagecount, $page, $url) { $pagelinkcount=8; if ($pagecount>1) { @@ -217,7 +217,7 @@ class OC_Util { $web_server_restart= false; //check for database drivers if(!(is_callable('sqlite_open') or class_exists('SQLite3')) and !is_callable('mysql_connect') and !is_callable('pg_connect')) { - $errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.<br/>','hint'=>'');//TODO: sane hint + $errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.<br/>', 'hint'=>'');//TODO: sane hint $web_server_restart= true; } @@ -226,13 +226,13 @@ class OC_Util { // Check if config folder is writable. if(!is_writable(OC::$SERVERROOT."/config/") or !is_readable(OC::$SERVERROOT."/config/")) { - $errors[]=array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud"); + $errors[]=array('error'=>"Can't write into config directory 'config'", 'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud"); } // Check if there is a writable install folder. if(OC_Config::getValue('appstoreenabled', true)) { if( OC_App::getInstallPath() === null || !is_writable(OC_App::getInstallPath()) || !is_readable(OC_App::getInstallPath()) ) { - $errors[]=array('error'=>"Can't write into apps directory",'hint'=>"You can usually fix this by giving the webserver user write access to the apps directory + $errors[]=array('error'=>"Can't write into apps directory", 'hint'=>"You can usually fix this by giving the webserver user write access to the apps directory in owncloud or disabling the appstore in the config file."); } } @@ -269,57 +269,57 @@ class OC_Util { if(!is_dir($CONFIG_DATADIRECTORY)) { $success=@mkdir($CONFIG_DATADIRECTORY); if(!$success) { - $errors[]=array('error'=>"Can't create data directory (".$CONFIG_DATADIRECTORY.")",'hint'=>"You can usually fix this by giving the webserver write access to the ownCloud directory '".OC::$SERVERROOT."' (in a terminal, use the command 'chown -R www-data:www-data /path/to/your/owncloud/install/data' "); + $errors[]=array('error'=>"Can't create data directory (".$CONFIG_DATADIRECTORY.")", 'hint'=>"You can usually fix this by giving the webserver write access to the ownCloud directory '".OC::$SERVERROOT."' (in a terminal, use the command 'chown -R www-data:www-data /path/to/your/owncloud/install/data' "); } } else if(!is_writable($CONFIG_DATADIRECTORY) or !is_readable($CONFIG_DATADIRECTORY)) { - $errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud<br/>','hint'=>$permissionsHint); + $errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud<br/>', 'hint'=>$permissionsHint); } // check if all required php modules are present if(!class_exists('ZipArchive')) { - $errors[]=array('error'=>'PHP module zip not installed.<br/>','hint'=>'Please ask your server administrator to install the module.'); + $errors[]=array('error'=>'PHP module zip not installed.<br/>', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(!function_exists('mb_detect_encoding')) { - $errors[]=array('error'=>'PHP module mb multibyte not installed.<br/>','hint'=>'Please ask your server administrator to install the module.'); + $errors[]=array('error'=>'PHP module mb multibyte not installed.<br/>', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(!function_exists('ctype_digit')) { - $errors[]=array('error'=>'PHP module ctype is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.'); + $errors[]=array('error'=>'PHP module ctype is not installed.<br/>', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(!function_exists('json_encode')) { - $errors[]=array('error'=>'PHP module JSON is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.'); + $errors[]=array('error'=>'PHP module JSON is not installed.<br/>', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(!function_exists('imagepng')) { - $errors[]=array('error'=>'PHP module GD is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.'); + $errors[]=array('error'=>'PHP module GD is not installed.<br/>', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(!function_exists('gzencode')) { - $errors[]=array('error'=>'PHP module zlib is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.'); + $errors[]=array('error'=>'PHP module zlib is not installed.<br/>', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(!function_exists('iconv')) { - $errors[]=array('error'=>'PHP module iconv is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.'); + $errors[]=array('error'=>'PHP module iconv is not installed.<br/>', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(!function_exists('simplexml_load_string')) { - $errors[]=array('error'=>'PHP module SimpleXML is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.'); + $errors[]=array('error'=>'PHP module SimpleXML is not installed.<br/>', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(floatval(phpversion())<5.3) { - $errors[]=array('error'=>'PHP 5.3 is required.<br/>','hint'=>'Please ask your server administrator to update PHP to version 5.3 or higher. PHP 5.2 is no longer supported by ownCloud and the PHP community.'); + $errors[]=array('error'=>'PHP 5.3 is required.<br/>', 'hint'=>'Please ask your server administrator to update PHP to version 5.3 or higher. PHP 5.2 is no longer supported by ownCloud and the PHP community.'); $web_server_restart= false; } if(!defined('PDO::ATTR_DRIVER_NAME')) { - $errors[]=array('error'=>'PHP PDO module is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.'); + $errors[]=array('error'=>'PHP PDO module is not installed.<br/>', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if($web_server_restart) { - $errors[]=array('error'=>'PHP modules have been installed, but they are still listed as missing?<br/>','hint'=>'Please ask your server administrator to restart the web server.'); + $errors[]=array('error'=>'PHP modules have been installed, but they are still listed as missing?<br/>', 'hint'=>'Please ask your server administrator to restart the web server.'); } return $errors; @@ -473,17 +473,6 @@ class OC_Util { } /** - * @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. @@ -491,40 +480,25 @@ class OC_Util { * 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() { - // generate a random token. - $token = self::generate_random_bytes(20); - - // store the token together with a timestamp in the session. - $_SESSION['requesttoken-'.$token]=time(); - - // cleanup old tokens garbage collector - // only run every 20th time so we don't waste cpu cycles - if(rand(0, 20)==0) { - foreach($_SESSION as $key=>$value) { - // search all tokens in the session - if(substr($key, 0, 12)=='requesttoken') { - // check if static lifespan has expired - if($value+self::$callLifespan<time()) { - // remove outdated tokens - unset($_SESSION[$key]); - } - } - } + // Check if a token exists + if(!isset($_SESSION['requesttoken'])) { + // No valid token found, generate a new one. + $requestToken = self::generate_random_bytes(20); + $_SESSION['requesttoken']=$requestToken; + } else { + // Valid token already exists, send it + $requestToken = $_SESSION['requesttoken']; } - // return the token - return($token); + return($requestToken); } /** * @brief Check an ajax get/post call if the request token is valid. * @return boolean False if request token is not set or is invalid. - * @see OC_Util::$callLifespan - * @see OC_Util::calLRegister() + * @see OC_Util::callRegister() */ public static function isCallRegistered() { if(isset($_GET['requesttoken'])) { @@ -537,17 +511,14 @@ class OC_Util { //no token found. return false; } - if(isset($_SESSION['requesttoken-'.$token])) { - $timestamp=$_SESSION['requesttoken-'.$token]; - // check if static lifespan has expired - if($timestamp+self::$callLifespan<time()) { - return false; - }else{ - //token valid - return true; - } - }else{ + + // Check if the token is valid + if($token !== $_SESSION['requesttoken']) { + // Not valid return false; + } else { + // Valid token + return true; } } @@ -588,7 +559,7 @@ class OC_Util { // creating a test file $testfile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ).'/'.$filename; - if(file_exists($testfile)){// already running this test, possible recursive call + if(file_exists($testfile)) {// already running this test, possible recursive call return false; } diff --git a/lib/vcategories.php b/lib/vcategories.php index ba6569a244d..46256def9c4 100644 --- a/lib/vcategories.php +++ b/lib/vcategories.php @@ -66,7 +66,7 @@ class OC_VCategories { * @returns array containing the categories as strings. */ public function categories() { - //OC_Log::write('core','OC_VCategories::categories: '.print_r($this->categories, true), OC_Log::DEBUG); + //OC_Log::write('core', 'OC_VCategories::categories: '.print_r($this->categories, true), OC_Log::DEBUG); if(!$this->categories) { return array(); } @@ -139,12 +139,12 @@ class OC_VCategories { $this->categories = array(); } foreach($objects as $object) { - //OC_Log::write('core','OC_VCategories::rescan: '.substr($object, 0, 100).'(...)', OC_Log::DEBUG); + //OC_Log::write('core', 'OC_VCategories::rescan: '.substr($object, 0, 100).'(...)', OC_Log::DEBUG); $vobject = OC_VObject::parse($object); if(!is_null($vobject)) { $this->loadFromVObject($vobject, $sync); } else { - OC_Log::write('core','OC_VCategories::rescan, unable to parse. ID: '.', '.substr($object, 0, 100).'(...)', OC_Log::DEBUG); + OC_Log::write('core', 'OC_VCategories::rescan, unable to parse. ID: '.', '.substr($object, 0, 100).'(...)', OC_Log::DEBUG); } } $this->save(); @@ -158,9 +158,9 @@ class OC_VCategories { usort($this->categories, 'strnatcasecmp'); // usort to also renumber the keys $escaped_categories = serialize($this->categories); OC_Preferences::setValue($this->user, $this->app, self::PREF_CATEGORIES_LABEL, $escaped_categories); - OC_Log::write('core','OC_VCategories::save: '.print_r($this->categories, true), OC_Log::DEBUG); + OC_Log::write('core', 'OC_VCategories::save: '.print_r($this->categories, true), OC_Log::DEBUG); } else { - OC_Log::write('core','OC_VCategories::save: $this->categories is not an array! '.print_r($this->categories, true), OC_Log::ERROR); + OC_Log::write('core', 'OC_VCategories::save: $this->categories is not an array! '.print_r($this->categories, true), OC_Log::ERROR); } } @@ -173,37 +173,37 @@ class OC_VCategories { if(!is_array($names)) { $names = array($names); } - OC_Log::write('core','OC_VCategories::delete, before: '.print_r($this->categories, true), OC_Log::DEBUG); + OC_Log::write('core', 'OC_VCategories::delete, before: '.print_r($this->categories, true), OC_Log::DEBUG); foreach($names as $name) { - OC_Log::write('core','OC_VCategories::delete: '.$name, OC_Log::DEBUG); + OC_Log::write('core', 'OC_VCategories::delete: '.$name, OC_Log::DEBUG); if($this->hasCategory($name)) { - //OC_Log::write('core','OC_VCategories::delete: '.$name.' got it', OC_Log::DEBUG); + //OC_Log::write('core', 'OC_VCategories::delete: '.$name.' got it', OC_Log::DEBUG); unset($this->categories[$this->array_searchi($name, $this->categories)]); } } $this->save(); - OC_Log::write('core','OC_VCategories::delete, after: '.print_r($this->categories, true), OC_Log::DEBUG); + OC_Log::write('core', 'OC_VCategories::delete, after: '.print_r($this->categories, true), OC_Log::DEBUG); if(!is_null($objects)) { foreach($objects as $key=>&$value) { $vobject = OC_VObject::parse($value[1]); if(!is_null($vobject)) { $categories = $vobject->getAsArray('CATEGORIES'); - //OC_Log::write('core','OC_VCategories::delete, before: '.$key.': '.print_r($categories, true), OC_Log::DEBUG); + //OC_Log::write('core', 'OC_VCategories::delete, before: '.$key.': '.print_r($categories, true), OC_Log::DEBUG); foreach($names as $name) { $idx = $this->array_searchi($name, $categories); - //OC_Log::write('core','OC_VCategories::delete, loop: '.$name.', '.print_r($idx, true), OC_Log::DEBUG); + //OC_Log::write('core', 'OC_VCategories::delete, loop: '.$name.', '.print_r($idx, true), OC_Log::DEBUG); if($idx !== false) { - OC_Log::write('core','OC_VCategories::delete, unsetting: '.$categories[$this->array_searchi($name, $categories)], OC_Log::DEBUG); + OC_Log::write('core', 'OC_VCategories::delete, unsetting: '.$categories[$this->array_searchi($name, $categories)], OC_Log::DEBUG); unset($categories[$this->array_searchi($name, $categories)]); //unset($categories[$idx]); } } - //OC_Log::write('core','OC_VCategories::delete, after: '.$key.': '.print_r($categories, true), OC_Log::DEBUG); + //OC_Log::write('core', 'OC_VCategories::delete, after: '.$key.': '.print_r($categories, true), OC_Log::DEBUG); $vobject->setString('CATEGORIES', implode(',', $categories)); $value[1] = $vobject->serialize(); $objects[$key] = $value; } else { - OC_Log::write('core','OC_VCategories::delete, unable to parse. ID: '.$value[0].', '.substr($value[1], 0, 50).'(...)', OC_Log::DEBUG); + OC_Log::write('core', 'OC_VCategories::delete, unable to parse. ID: '.$value[0].', '.substr($value[1], 0, 50).'(...)', OC_Log::DEBUG); } } } @@ -222,7 +222,7 @@ class OC_VCategories { if(!is_array($haystack)) { return false; } - return array_search(strtolower($needle), array_map('strtolower',$haystack)); + return array_search(strtolower($needle), array_map('strtolower', $haystack)); } } diff --git a/lib/vobject.php b/lib/vobject.php index 44a5fbafdb3..267176ebc07 100644 --- a/lib/vobject.php +++ b/lib/vobject.php @@ -201,7 +201,7 @@ class OC_VObject{ return $this->vobject->__isset($name); } - public function __call($function,$arguments) { + public function __call($function, $arguments) { return call_user_func_array(array($this->vobject, $function), $arguments); } } diff --git a/ocs/providers.php b/ocs/providers.php index 4c68ded914e..43c9dc2aa42 100644 --- a/ocs/providers.php +++ b/ocs/providers.php @@ -3,22 +3,22 @@ /** * ownCloud * -* @author Frank Karlitschek -* @copyright 2012 Frank Karlitschek frank@owncloud.org -* +* @author Frank Karlitschek +* @copyright 2012 Frank Karlitschek frank@owncloud.org +* * 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 +* 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 +* +* You should have received a copy of the GNU Affero General Public * License along with this library. If not, see <http://www.gnu.org/licenses/>. -* +* */ require_once '../lib/base.php'; diff --git a/ocs/v1.php b/ocs/v1.php index b12ea5ef18d..1652b0bedbe 100644 --- a/ocs/v1.php +++ b/ocs/v1.php @@ -3,22 +3,22 @@ /** * ownCloud * -* @author Frank Karlitschek -* @copyright 2012 Frank Karlitschek frank@owncloud.org -* +* @author Frank Karlitschek +* @copyright 2012 Frank Karlitschek frank@owncloud.org +* * 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 +* 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 +* +* You should have received a copy of the GNU Affero General Public * License along with this library. If not, see <http://www.gnu.org/licenses/>. -* +* */ require_once '../lib/base.php'; diff --git a/settings/admin.php b/settings/admin.php index 9cb70353f9c..c704704ed33 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -20,22 +20,22 @@ $htaccessworking=OC_Util::ishtaccessworking(); $entries=OC_Log_Owncloud::getEntries(3); $entriesremain=(count(OC_Log_Owncloud::getEntries(4)) > 3)?true:false; -function compareEntries($a,$b) { +function compareEntries($a, $b) { return $b->time - $a->time; } usort($entries, 'compareEntries'); -$tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 )); -$tmpl->assign('entries',$entries); +$tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 )); +$tmpl->assign('entries', $entries); $tmpl->assign('entriesremain', $entriesremain); -$tmpl->assign('htaccessworking',$htaccessworking); +$tmpl->assign('htaccessworking', $htaccessworking); $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax')); $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes')); $tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes')); $tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes')); $tmpl->assign('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global')); -$tmpl->assign('forms',array()); +$tmpl->assign('forms', array()); foreach($forms as $form) { - $tmpl->append('forms',$form); + $tmpl->append('forms', $form); } $tmpl->printPage(); diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php index a0fe5947b6d..b2db2611518 100644 --- a/settings/ajax/changepassword.php +++ b/settings/ajax/changepassword.php @@ -16,8 +16,7 @@ if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) { $userstatus = 'subadmin'; } if(OC_User::getUser() === $username) { - if (OC_User::checkPassword($username, $oldPassword)) - { + if (OC_User::checkPassword($username, $oldPassword)) { $userstatus = 'user'; } else { if (!OC_Util::isUserVerified()) { diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php index c87ff422f61..16b48c8a9ca 100644 --- a/settings/ajax/createuser.php +++ b/settings/ajax/createuser.php @@ -43,9 +43,9 @@ try { } OC_Group::addToGroup( $username, $i ); } - OC_JSON::success(array("data" => - array( - "username" => $username, + OC_JSON::success(array("data" => + array( + "username" => $username, "groups" => implode( ", ", OC_Group::getUserGroups( $username ))))); } catch (Exception $exception) { OC_JSON::error(array("data" => array( "message" => $exception->getMessage()))); diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php index 22128ef57b5..043124fa175 100644 --- a/settings/ajax/getlog.php +++ b/settings/ajax/getlog.php @@ -10,7 +10,7 @@ OC_JSON::checkAdminUser(); $count=(isset($_GET['count']))?$_GET['count']:50; $offset=(isset($_GET['offset']))?$_GET['offset']:0; -$entries=OC_Log_Owncloud::getEntries($count,$offset); +$entries=OC_Log_Owncloud::getEntries($count, $offset); OC_JSON::success(array( - "data" => OC_Util::sanitizeHTML($entries), + "data" => OC_Util::sanitizeHTML($entries), "remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $offset)) != 0) ? true : false)); diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php index 4b32585b306..845f8ea408c 100644 --- a/settings/ajax/setquota.php +++ b/settings/ajax/setquota.php @@ -36,5 +36,5 @@ if($username) { } OC_Appconfig::setValue('files', 'default_quota', $quota); } -OC_JSON::success(array("data" => array( "username" => $username ,'quota' => $quota))); +OC_JSON::success(array("data" => array( "username" => $username , 'quota' => $quota))); diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php index 61b1a388fc3..eaeade60a39 100644 --- a/settings/ajax/userlist.php +++ b/settings/ajax/userlist.php @@ -32,9 +32,9 @@ if (OC_Group::inGroup(OC_User::getUser(), 'admin')) { $batch = OC_User::getUsers('', 10, $offset); foreach ($batch as $user) { $users[] = array( - 'name' => $user, - 'groups' => join(', ', OC_Group::getUserGroups($user)), - 'subadmin' => join(', ', OC_SubAdmin::getSubAdminsGroups($user)), + 'name' => $user, + 'groups' => join(', ', OC_Group::getUserGroups($user)), + 'subadmin' => join(', ', OC_SubAdmin::getSubAdminsGroups($user)), 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default')); } } else { @@ -42,8 +42,8 @@ if (OC_Group::inGroup(OC_User::getUser(), 'admin')) { $batch = OC_Group::usersInGroups($groups, '', 10, $offset); foreach ($batch as $user) { $users[] = array( - 'name' => $user, - 'groups' => join(', ', OC_Group::getUserGroups($user)), + 'name' => $user, + 'groups' => join(', ', OC_Group::getUserGroups($user)), 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default')); } } diff --git a/settings/apps.php b/settings/apps.php index 8134b44143a..155291333f3 100644 --- a/settings/apps.php +++ b/settings/apps.php @@ -95,11 +95,11 @@ if ( $remoteApps ) { foreach ( $remoteApps AS $key => $remote ) { - if ( + if ( $app['name'] == $remote['name'] - // To set duplicate detection to use OCS ID instead of string name, - // enable this code, remove the line of code above, - // and add <ocs_id>[ID]</ocs_id> to info.xml of each 3rd party app: + // To set duplicate detection to use OCS ID instead of string name, + // enable this code, remove the line of code above, + // and add <ocs_id>[ID]</ocs_id> to info.xml of each 3rd party app: // OR $app['ocs_id'] == $remote['ocs_id'] ) { diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php index 8c36f08fbb7..86bf98003af 100644 --- a/settings/l10n/et_EE.php +++ b/settings/l10n/et_EE.php @@ -19,6 +19,8 @@ "__language_name__" => "Eesti", "Security Warning" => "Turvahoiatus", "Cron" => "Ajastatud töö", +"Execute one task with each page loaded" => "Kävita igal lehe laadimisel üks ülesanne", +"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Kasuta süsteemide cron teenust. Käivita owncloudi kaustas fail cron.php läbi süsteemi cronjobi kord minutis.", "Sharing" => "Jagamine", "Enable Share API" => "Luba jagamise API", "Allow apps to use the Share API" => "Luba rakendustel kasutada jagamise API-t", @@ -41,6 +43,7 @@ "Problems connecting to help database." => "Probleemid abiinfo andmebaasiga ühendumisel.", "Go there manually." => "Mine sinna käsitsi.", "Answer" => "Vasta", +"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Sa oled kasutanud <strong>%s</strong> saadaolevast <strong>%s<strong>-st", "Desktop and Mobile Syncing Clients" => "Töölaua ja mobiiliga sünkroniseerimise rakendused", "Download" => "Lae alla", "Your password was changed" => "Sinu parooli on muudetud", diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php index daeb1b78e7f..c7d4f2e97d7 100644 --- a/settings/l10n/nb_NO.php +++ b/settings/l10n/nb_NO.php @@ -1,20 +1,34 @@ <?php $TRANSLATIONS = array( "Unable to load list from App Store" => "Lasting av liste fra App Store feilet.", -"Authentication error" => "Autentikasjonsfeil", +"Group already exists" => "Gruppen finnes allerede", +"Unable to add group" => "Kan ikke legge til gruppe", +"Could not enable app. " => "Kan ikke aktivere app.", "Email saved" => "Epost lagret", "Invalid email" => "Ugyldig epost", "OpenID Changed" => "OpenID endret", "Invalid request" => "Ugyldig forespørsel", +"Unable to delete group" => "Kan ikke slette gruppe", +"Authentication error" => "Autentikasjonsfeil", +"Unable to delete user" => "Kan ikke slette bruker", "Language changed" => "SprÃ¥k endret", +"Unable to add user to group %s" => "Kan ikke legge bruker til gruppen %s", +"Unable to remove user from group %s" => "Kan ikke slette bruker fra gruppen %s", "Disable" => "SlÃ¥ avBehandle ", "Enable" => "SlÃ¥ pÃ¥", "Saving..." => "Lagrer...", "__language_name__" => "__language_name__", "Security Warning" => "Sikkerhetsadvarsel", "Cron" => "Cron", +"Sharing" => "Deling", +"Allow links" => "Tillat lenker", +"Allow users to share items to the public with links" => "Tillat brukere Ã¥ dele filer med lenker", +"Allow users to share items shared with them again" => "Tillat brukere Ã¥ dele filer som allerede har blitt delt med dem", +"Allow users to share with anyone" => "Tillat brukere Ã¥ dele med alle", +"Allow users to only share with users in their groups" => "Tillat kun deling med andre brukere i samme gruppe", "Log" => "Logg", "More" => "Mer", "Add your App" => "Legg til din App", +"More Apps" => "Flere Apps", "Select an App" => "Velg en app", "See application page at apps.owncloud.com" => "Se applikasjonens side pÃ¥ apps.owncloud.org", "Documentation" => "Dokumentasjon", @@ -23,8 +37,10 @@ "Problems connecting to help database." => "Problemer med Ã¥ koble til hjelp-databasen", "Go there manually." => "GÃ¥ dit manuelt", "Answer" => "Svar", +"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>", "Desktop and Mobile Syncing Clients" => "Klienter for datamaskiner og mobile enheter", "Download" => "Last ned", +"Your password was changed" => "Passord har blitt endret", "Unable to change your password" => "Kunne ikke endre passordet ditt", "Current password" => "NÃ¥værende passord", "New password" => "Nytt passord", diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php index ecd2403c293..d3e7755c581 100644 --- a/settings/l10n/si_LK.php +++ b/settings/l10n/si_LK.php @@ -2,6 +2,8 @@ "Group already exists" => "කණ්ඩà·à¶ºà¶¸ දà·à¶±à¶§à¶¸à¶à·Š à¶à·’බේ", "Unable to add group" => "කà·à¶«à¶©à¶ºà¶šà·Š එක් කළ නොහà·à¶šà·’ විය", "Could not enable app. " => "යෙදුම සක්â€à¶»à·“ය කළ නොහà·à¶šà·’ විය.", +"Email saved" => "වි-à¶à·à¶´à·‘ල සුරකින ලදී", +"Invalid email" => "අවලංගු වි-à¶à·à¶´à·‘ල", "Invalid request" => "අවලංගු අයදුම", "Unable to delete group" => "කණ්ඩà·à¶ºà¶¸ මà·à¶šà·“මට නොහà·à¶š", "Unable to delete user" => "පරිà·à·“ලකය෠මà·à¶šà·“මට නොහà·à¶š", @@ -11,6 +13,7 @@ "Disable" => "අක්â€à¶»à·’ය කරන්න", "Enable" => "ක්â€à¶»à·’යà¶à·Šà¶¸à¶š කරන්න", "Saving..." => "සුරà·à¶šà·™à¶¸à·’න් පවà¶à·“...", +"Security Warning" => "ආරක්ෂක නිවේදනයක්", "Sharing" => "හුවමà·à¶»à·” කිරීම", "Allow links" => "යොමු සලසන්න", "Allow resharing" => "යළි යළිà¶à·Š හුවමà·à¶»à·”වට අවසර දෙමි", @@ -31,7 +34,7 @@ "Download" => "භà·à¶œà¶ කරන්න", "Your password was changed" => "ඔබගේ මුර පදය වෙනස් කෙරුණි", "Unable to change your password" => "මුර පදය වෙනස් කළ නොහà·à¶šà·’ විය", -"Current password" => "නූà¶à¶± මුරපදය", +"Current password" => "à·€à¶à·Šà¶¸à¶±à·Š මුරපදය", "New password" => "නව මුරපදය", "show" => "ප්â€à¶»à¶¯à¶»à·Šà·à¶±à¶º කිරීම", "Change password" => "මුරපදය වෙනස් කිරීම", @@ -43,7 +46,8 @@ "Name" => "නà·à¶¸à¶º", "Password" => "මුරපදය", "Groups" => "සමූහය", -"Create" => "à¶à¶±à¶±à·€à·", +"Create" => "à¶à¶±à¶±à·Šà¶±", +"Default Quota" => "à·ƒà·à¶¸à·à¶±à·Šâ€à¶º සලà·à¶šà¶º", "Other" => "වෙනà¶à·Š", "Group Admin" => "කà·à¶«à·Šà¶© පරිපà·à¶½à¶š", "Quota" => "සලà·à¶šà¶º", diff --git a/settings/languageCodes.php b/settings/languageCodes.php index 221aa13cf6a..71655800856 100644 --- a/settings/languageCodes.php +++ b/settings/languageCodes.php @@ -3,7 +3,7 @@ * This file is licensed under the Affero General Public License version 3 or later. * See the COPYING-README file. */ - + return array( 'bg_BG'=>'българÑки език', 'ca'=>'Català ', diff --git a/settings/personal.php b/settings/personal.php index f28ab2ae755..47dbcc53ebc 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -40,11 +40,11 @@ $languages=array(); foreach($languageCodes as $lang) { $l=OC_L10N::get('settings', $lang); if(substr($l->t('__language_name__'), 0, 1)!='_') {//first check if the language name is in the translation file - $languages[]=array('code'=>$lang,'name'=>$l->t('__language_name__')); + $languages[]=array('code'=>$lang, 'name'=>$l->t('__language_name__')); }elseif(isset($languageNames[$lang])) { - $languages[]=array('code'=>$lang,'name'=>$languageNames[$lang]); + $languages[]=array('code'=>$lang, 'name'=>$languageNames[$lang]); }else{//fallback to language code - $languages[]=array('code'=>$lang,'name'=>$lang); + $languages[]=array('code'=>$lang, 'name'=>$lang); } } diff --git a/settings/routes.php b/settings/routes.php index 64f4650eb8c..8239fe005db 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -24,13 +24,13 @@ $this->create('settings_admin', '/settings/admin') $this->create('settings_ajax_userlist', '/settings/ajax/userlist') ->actionInclude('settings/ajax/userlist.php'); $this->create('settings_ajax_createuser', '/settings/ajax/createuser.php') - ->actionInclude('settings_ajax_createuser'); + ->actionInclude('settings/ajax/createuser.php'); $this->create('settings_ajax_removeuser', '/settings/ajax/removeuser.php') ->actionInclude('settings/ajax/removeuser.php'); $this->create('settings_ajax_setquota', '/settings/ajax/setquota.php') ->actionInclude('settings/ajax/setquota.php'); $this->create('settings_ajax_creategroup', '/settings/ajax/creategroup.php') - ->actionInclude('settings_ajax_creategroup'); + ->actionInclude('settings/ajax/creategroup.php'); $this->create('settings_ajax_togglegroups', '/settings/ajax/togglegroups.php') ->actionInclude('settings/ajax/togglegroups.php'); $this->create('settings_ajax_togglesubadmins', '/settings/ajax/togglesubadmins.php') diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 35f34489fec..300d6093d6f 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -3,7 +3,7 @@ * This file is licensed under the Affero General Public License version 3 or later. * See the COPYING-README file. */ -$levels=array('Debug','Info','Warning','Error','Fatal'); +$levels=array('Debug','Info','Warning','Error', 'Fatal'); ?> <?php diff --git a/settings/templates/apps.php b/settings/templates/apps.php index 1e9598de1e3..38e2af8a51a 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -16,7 +16,7 @@ data-type="<?php echo $app['internal'] ? 'internal' : 'external' ?>" data-installed="1"> <a class="app<?php if(!$app['internal']) echo ' externalapp' ?>" href="?appid=<?php echo $app['id'] ?>"><?php echo htmlentities($app['name']) ?></a> <script type="application/javascript"> - appData_<?php echo $app['id'] ?>=<?php OC_JSON::encodedPrint($app,false) ?>; + appData_<?php echo $app['id'] ?>=<?php OC_JSON::encodedPrint($app, false) ?>; </script> <?php if(!$app['internal']) echo '<small class="externalapp list">3rd party</small>' ?> </li> diff --git a/settings/templates/help.php b/settings/templates/help.php index b2a78ff8512..9bb46740f5b 100644 --- a/settings/templates/help.php +++ b/settings/templates/help.php @@ -1,4 +1,4 @@ -<?php +<?php /** * 2012 Frank Karlitschek frank@owncloud.org * This file is licensed under the Affero General Public License version 3 or later. @@ -12,8 +12,7 @@ <?php $url=OC_Helper::linkTo( "settings", "help.php" ).'?page='; $pageNavi=OC_Util::getPageNavi($_['pagecount'], $_['page'], $url); - if($pageNavi) - { + if($pageNavi) { $pageNavi->printPage(); } ?> diff --git a/settings/templates/users.php b/settings/templates/users.php index eef9b291357..de7e50da8f3 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -142,7 +142,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>; </div> </td> <td class="remove"> - <?php if($user['name']!=OC_User::getUser()):?> + <?php if($user['name']!=OC_User::getUser()):?> <a href="#" class="action delete" original-title="<?php echo $l->t('Delete')?>"> <img src="<?php echo image_path('core', 'actions/delete.svg') ?>" /> </a> diff --git a/settings/users.php b/settings/users.php index 6eaae474538..93a259f1cd8 100644 --- a/settings/users.php +++ b/settings/users.php @@ -31,7 +31,7 @@ if($isadmin) { foreach($accessibleusers as $i) { $users[] = array( - "name" => $i, + "name" => $i, "groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($i)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/), 'quota'=>OC_Preferences::getValue($i, 'files', 'quota', 'default'), 'subadmin'=>implode(', ', OC_SubAdmin::getSubAdminsGroups($i))); @@ -42,7 +42,7 @@ foreach( $accessiblegroups as $i ) { $groups[] = array( "name" => $i ); } $quotaPreset=OC_Appconfig::getValue('files', 'quota_preset', 'default,none,1 GB, 5 GB, 10 GB'); -$quotaPreset=explode(',',$quotaPreset); +$quotaPreset=explode(',', $quotaPreset); foreach($quotaPreset as &$preset) { $preset=trim($preset); } diff --git a/tests/bootstrap.php b/tests/bootstrap.php index f8364b71ef7..4080a974be7 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -2,25 +2,25 @@ require_once __DIR__.'/../lib/base.php'; -if(!class_exists('PHPUnit_Framework_TestCase')){ +if(!class_exists('PHPUnit_Framework_TestCase')) { require_once('PHPUnit/Autoload.php'); } //SimpleTest compatibility abstract class UnitTestCase extends PHPUnit_Framework_TestCase{ - function assertEqual($expected, $actual, $string=''){ + function assertEqual($expected, $actual, $string='') { $this->assertEquals($expected, $actual, $string); } - function assertNotEqual($expected, $actual, $string=''){ + function assertNotEqual($expected, $actual, $string='') { $this->assertNotEquals($expected, $actual, $string); } - static function assertTrue($actual, $string=''){ + static function assertTrue($actual, $string='') { parent::assertTrue((bool)$actual, $string); } - static function assertFalse($actual, $string=''){ + static function assertFalse($actual, $string='') { parent::assertFalse((bool)$actual, $string); } } diff --git a/tests/lib/archive.php b/tests/lib/archive.php index 04ae722aea7..cd2ca6630a5 100644 --- a/tests/lib/archive.php +++ b/tests/lib/archive.php @@ -26,24 +26,24 @@ abstract class Test_Archive extends UnitTestCase { public function testGetFiles() { $this->instance=$this->getExisting(); $allFiles=$this->instance->getFiles(); - $expected=array('lorem.txt','logo-wide.png','dir/','dir/lorem.txt'); - $this->assertEqual(4,count($allFiles),'only found '.count($allFiles).' out of 4 expected files'); + $expected=array('lorem.txt','logo-wide.png','dir/', 'dir/lorem.txt'); + $this->assertEqual(4, count($allFiles), 'only found '.count($allFiles).' out of 4 expected files'); foreach($expected as $file) { $this->assertContains($file, $allFiles, 'cant find '. $file . ' in archive'); - $this->assertTrue($this->instance->fileExists($file),'file '.$file.' does not exist in archive'); + $this->assertTrue($this->instance->fileExists($file), 'file '.$file.' does not exist in archive'); } $this->assertFalse($this->instance->fileExists('non/existing/file')); $rootContent=$this->instance->getFolder(''); - $expected=array('lorem.txt','logo-wide.png','dir/'); - $this->assertEqual(3,count($rootContent)); + $expected=array('lorem.txt','logo-wide.png', 'dir/'); + $this->assertEqual(3, count($rootContent)); foreach($expected as $file) { $this->assertContains($file, $rootContent, 'cant find '. $file . ' in archive'); } $dirContent=$this->instance->getFolder('dir/'); $expected=array('lorem.txt'); - $this->assertEqual(1,count($dirContent)); + $this->assertEqual(1, count($dirContent)); foreach($expected as $file) { $this->assertContains($file, $dirContent, 'cant find '. $file . ' in archive'); } @@ -53,47 +53,47 @@ abstract class Test_Archive extends UnitTestCase { $this->instance=$this->getExisting(); $dir=OC::$SERVERROOT.'/tests/data'; $textFile=$dir.'/lorem.txt'; - $this->assertEqual(file_get_contents($textFile),$this->instance->getFile('lorem.txt')); + $this->assertEqual(file_get_contents($textFile), $this->instance->getFile('lorem.txt')); $tmpFile=OCP\Files::tmpFile('.txt'); - $this->instance->extractFile('lorem.txt',$tmpFile); - $this->assertEqual(file_get_contents($textFile),file_get_contents($tmpFile)); + $this->instance->extractFile('lorem.txt', $tmpFile); + $this->assertEqual(file_get_contents($textFile), file_get_contents($tmpFile)); } public function testWrite() { $dir=OC::$SERVERROOT.'/tests/data'; $textFile=$dir.'/lorem.txt'; $this->instance=$this->getNew(); - $this->assertEqual(0,count($this->instance->getFiles())); - $this->instance->addFile('lorem.txt',$textFile); - $this->assertEqual(1,count($this->instance->getFiles())); + $this->assertEqual(0, count($this->instance->getFiles())); + $this->instance->addFile('lorem.txt', $textFile); + $this->assertEqual(1, count($this->instance->getFiles())); $this->assertTrue($this->instance->fileExists('lorem.txt')); $this->assertFalse($this->instance->fileExists('lorem.txt/')); - $this->assertEqual(file_get_contents($textFile),$this->instance->getFile('lorem.txt')); - $this->instance->addFile('lorem.txt','foobar'); - $this->assertEqual('foobar',$this->instance->getFile('lorem.txt')); + $this->assertEqual(file_get_contents($textFile), $this->instance->getFile('lorem.txt')); + $this->instance->addFile('lorem.txt', 'foobar'); + $this->assertEqual('foobar', $this->instance->getFile('lorem.txt')); } public function testReadStream() { $dir=OC::$SERVERROOT.'/tests/data'; $this->instance=$this->getExisting(); - $fh=$this->instance->getStream('lorem.txt','r'); + $fh=$this->instance->getStream('lorem.txt', 'r'); $this->assertTrue($fh); - $content=fread($fh,$this->instance->filesize('lorem.txt')); + $content=fread($fh, $this->instance->filesize('lorem.txt')); fclose($fh); - $this->assertEqual(file_get_contents($dir.'/lorem.txt'),$content); + $this->assertEqual(file_get_contents($dir.'/lorem.txt'), $content); } public function testWriteStream() { $dir=OC::$SERVERROOT.'/tests/data'; $this->instance=$this->getNew(); - $fh=$this->instance->getStream('lorem.txt','w'); - $source=fopen($dir.'/lorem.txt','r'); - OCP\Files::streamCopy($source,$fh); + $fh=$this->instance->getStream('lorem.txt', 'w'); + $source=fopen($dir.'/lorem.txt', 'r'); + OCP\Files::streamCopy($source, $fh); fclose($source); fclose($fh); $this->assertTrue($this->instance->fileExists('lorem.txt')); - $this->assertEqual(file_get_contents($dir.'/lorem.txt'),$this->instance->getFile('lorem.txt')); + $this->assertEqual(file_get_contents($dir.'/lorem.txt'), $this->instance->getFile('lorem.txt')); } public function testFolder() { $this->instance=$this->getNew(); @@ -111,29 +111,29 @@ abstract class Test_Archive extends UnitTestCase { $this->instance=$this->getExisting(); $tmpDir=OCP\Files::tmpFolder(); $this->instance->extract($tmpDir); - $this->assertEqual(true,file_exists($tmpDir.'lorem.txt')); - $this->assertEqual(true,file_exists($tmpDir.'dir/lorem.txt')); - $this->assertEqual(true,file_exists($tmpDir.'logo-wide.png')); - $this->assertEqual(file_get_contents($dir.'/lorem.txt'),file_get_contents($tmpDir.'lorem.txt')); + $this->assertEqual(true, file_exists($tmpDir.'lorem.txt')); + $this->assertEqual(true, file_exists($tmpDir.'dir/lorem.txt')); + $this->assertEqual(true, file_exists($tmpDir.'logo-wide.png')); + $this->assertEqual(file_get_contents($dir.'/lorem.txt'), file_get_contents($tmpDir.'lorem.txt')); OCP\Files::rmdirr($tmpDir); } public function testMoveRemove() { $dir=OC::$SERVERROOT.'/tests/data'; $textFile=$dir.'/lorem.txt'; $this->instance=$this->getNew(); - $this->instance->addFile('lorem.txt',$textFile); + $this->instance->addFile('lorem.txt', $textFile); $this->assertFalse($this->instance->fileExists('target.txt')); - $this->instance->rename('lorem.txt','target.txt'); + $this->instance->rename('lorem.txt', 'target.txt'); $this->assertTrue($this->instance->fileExists('target.txt')); $this->assertFalse($this->instance->fileExists('lorem.txt')); - $this->assertEqual(file_get_contents($textFile),$this->instance->getFile('target.txt')); + $this->assertEqual(file_get_contents($textFile), $this->instance->getFile('target.txt')); $this->instance->remove('target.txt'); $this->assertFalse($this->instance->fileExists('target.txt')); } public function testRecursive() { $dir=OC::$SERVERROOT.'/tests/data'; $this->instance=$this->getNew(); - $this->instance->addRecursive('/dir',$dir); + $this->instance->addRecursive('/dir', $dir); $this->assertTrue($this->instance->fileExists('/dir/lorem.txt')); $this->assertTrue($this->instance->fileExists('/dir/data.zip')); $this->assertTrue($this->instance->fileExists('/dir/data.tar.gz')); diff --git a/tests/lib/cache.php b/tests/lib/cache.php index 08653d4a310..1a1287ff135 100644 --- a/tests/lib/cache.php +++ b/tests/lib/cache.php @@ -13,7 +13,7 @@ abstract class Test_Cache extends UnitTestCase { protected $instance; public function tearDown() { - if($this->instance){ + if($this->instance) { $this->instance->clear(); } } @@ -23,25 +23,25 @@ abstract class Test_Cache extends UnitTestCase { $this->assertFalse($this->instance->hasKey('value1')); $value='foobar'; - $this->instance->set('value1',$value); + $this->instance->set('value1', $value); $this->assertTrue($this->instance->hasKey('value1')); $received=$this->instance->get('value1'); - $this->assertEqual($value,$received,'Value recieved from cache not equal to the original'); + $this->assertEqual($value, $received, 'Value recieved from cache not equal to the original'); $value='ipsum lorum'; - $this->instance->set('value1',$value); + $this->instance->set('value1', $value); $received=$this->instance->get('value1'); - $this->assertEqual($value,$received,'Value not overwritten by second set'); + $this->assertEqual($value, $received, 'Value not overwritten by second set'); $value2='foobar'; - $this->instance->set('value2',$value2); + $this->instance->set('value2', $value2); $received2=$this->instance->get('value2'); $this->assertTrue($this->instance->hasKey('value1')); $this->assertTrue($this->instance->hasKey('value2')); - $this->assertEqual($value,$received,'Value changed while setting other variable'); - $this->assertEqual($value2,$received2,'Second value not equal to original'); + $this->assertEqual($value, $received, 'Value changed while setting other variable'); + $this->assertEqual($value2, $received2, 'Second value not equal to original'); $this->assertFalse($this->instance->hasKey('not_set')); - $this->assertNull($this->instance->get('not_set'),'Unset value not equal to null'); + $this->assertNull($this->instance->get('not_set'), 'Unset value not equal to null'); $this->assertTrue($this->instance->remove('value1')); $this->assertFalse($this->instance->hasKey('value1')); @@ -49,10 +49,10 @@ abstract class Test_Cache extends UnitTestCase { function testClear() { $value='ipsum lorum'; - $this->instance->set('1_value1',$value); - $this->instance->set('1_value2',$value); - $this->instance->set('2_value1',$value); - $this->instance->set('3_value1',$value); + $this->instance->set('1_value1', $value); + $this->instance->set('1_value2', $value); + $this->instance->set('2_value1', $value); + $this->instance->set('3_value1', $value); $this->assertTrue($this->instance->clear('1_')); $this->assertFalse($this->instance->hasKey('1_value1')); diff --git a/tests/lib/cache/apc.php b/tests/lib/cache/apc.php index f68b97bcbd9..bb5eb483dbf 100644 --- a/tests/lib/cache/apc.php +++ b/tests/lib/cache/apc.php @@ -22,11 +22,11 @@ class Test_Cache_APC extends Test_Cache { public function setUp() { - if(!extension_loaded('apc')){ + if(!extension_loaded('apc')) { $this->markTestSkipped('The apc extension is not available.'); return; } - if(!ini_get('apc.enable_cli') && OC::$CLI){ + if(!ini_get('apc.enable_cli') && OC::$CLI) { $this->markTestSkipped('apc not available in CLI.'); return; } diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php index 00be005d08d..d64627198e0 100644 --- a/tests/lib/cache/file.php +++ b/tests/lib/cache/file.php @@ -39,7 +39,7 @@ class Test_Cache_File extends Test_Cache { //set up temporary storage OC_Filesystem::clearMounts(); - OC_Filesystem::mount('OC_Filestorage_Temporary',array(),'/'); + OC_Filesystem::mount('OC_Filestorage_Temporary', array(), '/'); OC_User::clearBackends(); OC_User::useBackend(new OC_User_Dummy()); diff --git a/tests/lib/cache/xcache.php b/tests/lib/cache/xcache.php index c081036a31f..43bed2db037 100644 --- a/tests/lib/cache/xcache.php +++ b/tests/lib/cache/xcache.php @@ -22,7 +22,7 @@ class Test_Cache_XCache extends Test_Cache { public function setUp() { - if(!function_exists('xcache_get')){ + if(!function_exists('xcache_get')) { $this->markTestSkipped('The xcache extension is not available.'); return; } diff --git a/tests/lib/filesystem.php b/tests/lib/filesystem.php index e22b3f1c0d8..0008336383e 100644 --- a/tests/lib/filesystem.php +++ b/tests/lib/filesystem.php @@ -24,7 +24,7 @@ class Test_Filesystem extends UnitTestCase { /** * @var array tmpDirs */ - private $tmpDirs=array(); + private $tmpDirs = array(); /** * @return array @@ -72,21 +72,56 @@ class Test_Filesystem extends UnitTestCase { } } + public function testBlacklist() { + OC_Hook::clear('OC_Filesystem'); + OC_Hook::connect('OC_Filesystem', 'write', 'OC_Filesystem', 'isBlacklisted'); + OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted'); + + $run = true; + OC_Hook::emit( + OC_Filesystem::CLASSNAME, + OC_Filesystem::signal_write, + array( + OC_Filesystem::signal_param_path => '/test/.htaccess', + OC_Filesystem::signal_param_run => &$run + ) + ); + $this->assertFalse($run); + + if (OC_Filesystem::getView()) { + $user = OC_User::getUser(); + } else { + $user = uniqid(); + OC_Filesystem::init('/' . $user . '/files'); + } + + OC_Filesystem::mount('OC_Filestorage_Temporary', array(), '/'); + + $rootView = new OC_FilesystemView(''); + $rootView->mkdir('/' . $user); + $rootView->mkdir('/' . $user . '/files'); + + $this->assertFalse($rootView->file_put_contents('/.htaccess', 'foo')); + $this->assertFalse(OC_Filesystem::file_put_contents('/.htaccess', 'foo')); + $fh = fopen(__FILE__, 'r'); + $this->assertFalse(OC_Filesystem::file_put_contents('/.htaccess', $fh)); + } + public function testHooks() { - if(OC_Filesystem::getView()){ + if (OC_Filesystem::getView()) { $user = OC_User::getUser(); - }else{ - $user=uniqid(); - OC_Filesystem::init('/'.$user.'/files'); + } else { + $user = uniqid(); + OC_Filesystem::init('/' . $user . '/files'); } OC_Hook::clear('OC_Filesystem'); OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHook'); OC_Filesystem::mount('OC_Filestorage_Temporary', array(), '/'); - $rootView=new OC_FilesystemView(''); - $rootView->mkdir('/'.$user); - $rootView->mkdir('/'.$user.'/files'); + $rootView = new OC_FilesystemView(''); + $rootView->mkdir('/' . $user); + $rootView->mkdir('/' . $user . '/files'); OC_Filesystem::file_put_contents('/foo', 'foo'); OC_Filesystem::mkdir('/bar'); diff --git a/tests/lib/geo.php b/tests/lib/geo.php index cae3d550b33..d4951ee79e7 100644 --- a/tests/lib/geo.php +++ b/tests/lib/geo.php @@ -8,7 +8,7 @@ class Test_Geo extends UnitTestCase { function testTimezone() { - $result = OC_Geo::timezone(3,3); + $result = OC_Geo::timezone(3, 3); $expected = 'Africa/Porto-Novo'; $this->assertEquals($expected, $result); diff --git a/tests/lib/group.php b/tests/lib/group.php index 0bea9a00886..7b9ca3414b0 100644 --- a/tests/lib/group.php +++ b/tests/lib/group.php @@ -36,30 +36,30 @@ class Test_Group extends UnitTestCase { $user1=uniqid(); $user2=uniqid(); - $this->assertFalse(OC_Group::inGroup($user1,$group1)); - $this->assertFalse(OC_Group::inGroup($user2,$group1)); - $this->assertFalse(OC_Group::inGroup($user1,$group2)); - $this->assertFalse(OC_Group::inGroup($user2,$group2)); + $this->assertFalse(OC_Group::inGroup($user1, $group1)); + $this->assertFalse(OC_Group::inGroup($user2, $group1)); + $this->assertFalse(OC_Group::inGroup($user1, $group2)); + $this->assertFalse(OC_Group::inGroup($user2, $group2)); - $this->assertTrue(OC_Group::addToGroup($user1,$group1)); + $this->assertTrue(OC_Group::addToGroup($user1, $group1)); - $this->assertTrue(OC_Group::inGroup($user1,$group1)); - $this->assertFalse(OC_Group::inGroup($user2,$group1)); - $this->assertFalse(OC_Group::inGroup($user1,$group2)); - $this->assertFalse(OC_Group::inGroup($user2,$group2)); + $this->assertTrue(OC_Group::inGroup($user1, $group1)); + $this->assertFalse(OC_Group::inGroup($user2, $group1)); + $this->assertFalse(OC_Group::inGroup($user1, $group2)); + $this->assertFalse(OC_Group::inGroup($user2, $group2)); - $this->assertFalse(OC_Group::addToGroup($user1,$group1)); + $this->assertFalse(OC_Group::addToGroup($user1, $group1)); - $this->assertEqual(array($user1),OC_Group::usersInGroup($group1)); - $this->assertEqual(array(),OC_Group::usersInGroup($group2)); + $this->assertEqual(array($user1), OC_Group::usersInGroup($group1)); + $this->assertEqual(array(), OC_Group::usersInGroup($group2)); - $this->assertEqual(array($group1),OC_Group::getUserGroups($user1)); - $this->assertEqual(array(),OC_Group::getUserGroups($user2)); + $this->assertEqual(array($group1), OC_Group::getUserGroups($user1)); + $this->assertEqual(array(), OC_Group::getUserGroups($user2)); OC_Group::deleteGroup($group1); - $this->assertEqual(array(),OC_Group::getUserGroups($user1)); - $this->assertEqual(array(),OC_Group::usersInGroup($group1)); - $this->assertFalse(OC_Group::inGroup($user1,$group1)); + $this->assertEqual(array(), OC_Group::getUserGroups($user1)); + $this->assertEqual(array(), OC_Group::usersInGroup($group1)); + $this->assertFalse(OC_Group::inGroup($user1, $group1)); } function testMultiBackend() { @@ -73,42 +73,42 @@ class Test_Group extends UnitTestCase { OC_Group::createGroup($group1); //groups should be added to the first registered backend - $this->assertEqual(array($group1),$backend1->getGroups()); - $this->assertEqual(array(),$backend2->getGroups()); + $this->assertEqual(array($group1), $backend1->getGroups()); + $this->assertEqual(array(), $backend2->getGroups()); - $this->assertEqual(array($group1),OC_Group::getGroups()); + $this->assertEqual(array($group1), OC_Group::getGroups()); $this->assertTrue(OC_Group::groupExists($group1)); $this->assertFalse(OC_Group::groupExists($group2)); $backend1->createGroup($group2); - $this->assertEqual(array($group1,$group2),OC_Group::getGroups()); + $this->assertEqual(array($group1, $group2), OC_Group::getGroups()); $this->assertTrue(OC_Group::groupExists($group1)); $this->assertTrue(OC_Group::groupExists($group2)); $user1=uniqid(); $user2=uniqid(); - $this->assertFalse(OC_Group::inGroup($user1,$group1)); - $this->assertFalse(OC_Group::inGroup($user2,$group1)); + $this->assertFalse(OC_Group::inGroup($user1, $group1)); + $this->assertFalse(OC_Group::inGroup($user2, $group1)); - $this->assertTrue(OC_Group::addToGroup($user1,$group1)); + $this->assertTrue(OC_Group::addToGroup($user1, $group1)); - $this->assertTrue(OC_Group::inGroup($user1,$group1)); - $this->assertFalse(OC_Group::inGroup($user2,$group1)); - $this->assertFalse($backend2->inGroup($user1,$group1)); + $this->assertTrue(OC_Group::inGroup($user1, $group1)); + $this->assertFalse(OC_Group::inGroup($user2, $group1)); + $this->assertFalse($backend2->inGroup($user1, $group1)); - $this->assertFalse(OC_Group::addToGroup($user1,$group1)); + $this->assertFalse(OC_Group::addToGroup($user1, $group1)); - $this->assertEqual(array($user1),OC_Group::usersInGroup($group1)); + $this->assertEqual(array($user1), OC_Group::usersInGroup($group1)); - $this->assertEqual(array($group1),OC_Group::getUserGroups($user1)); - $this->assertEqual(array(),OC_Group::getUserGroups($user2)); + $this->assertEqual(array($group1), OC_Group::getUserGroups($user1)); + $this->assertEqual(array(), OC_Group::getUserGroups($user2)); OC_Group::deleteGroup($group1); - $this->assertEqual(array(),OC_Group::getUserGroups($user1)); - $this->assertEqual(array(),OC_Group::usersInGroup($group1)); - $this->assertFalse(OC_Group::inGroup($user1,$group1)); + $this->assertEqual(array(), OC_Group::getUserGroups($user1)); + $this->assertEqual(array(), OC_Group::usersInGroup($group1)); + $this->assertFalse(OC_Group::inGroup($user1, $group1)); } } diff --git a/tests/lib/group/backend.php b/tests/lib/group/backend.php index 61e008b6ca5..f61abed5f29 100644 --- a/tests/lib/group/backend.php +++ b/tests/lib/group/backend.php @@ -52,20 +52,20 @@ abstract class Test_Group_Backend extends UnitTestCase { $name2=$this->getGroupName(); $this->backend->createGroup($name1); $count=count($this->backend->getGroups())-$startCount; - $this->assertEqual(1,$count); - $this->assertTrue((array_search($name1,$this->backend->getGroups())!==false)); - $this->assertFalse((array_search($name2,$this->backend->getGroups())!==false)); + $this->assertEqual(1, $count); + $this->assertTrue((array_search($name1, $this->backend->getGroups())!==false)); + $this->assertFalse((array_search($name2, $this->backend->getGroups())!==false)); $this->backend->createGroup($name2); $count=count($this->backend->getGroups())-$startCount; - $this->assertEqual(2,$count); - $this->assertTrue((array_search($name1,$this->backend->getGroups())!==false)); - $this->assertTrue((array_search($name2,$this->backend->getGroups())!==false)); + $this->assertEqual(2, $count); + $this->assertTrue((array_search($name1, $this->backend->getGroups())!==false)); + $this->assertTrue((array_search($name2, $this->backend->getGroups())!==false)); $this->backend->deleteGroup($name2); $count=count($this->backend->getGroups())-$startCount; - $this->assertEqual(1,$count); - $this->assertTrue((array_search($name1,$this->backend->getGroups())!==false)); - $this->assertFalse((array_search($name2,$this->backend->getGroups())!==false)); + $this->assertEqual(1, $count); + $this->assertTrue((array_search($name1, $this->backend->getGroups())!==false)); + $this->assertFalse((array_search($name2, $this->backend->getGroups())!==false)); } public function testUser() { @@ -77,29 +77,29 @@ abstract class Test_Group_Backend extends UnitTestCase { $user1=$this->getUserName(); $user2=$this->getUserName(); - $this->assertFalse($this->backend->inGroup($user1,$group1)); - $this->assertFalse($this->backend->inGroup($user2,$group1)); - $this->assertFalse($this->backend->inGroup($user1,$group2)); - $this->assertFalse($this->backend->inGroup($user2,$group2)); + $this->assertFalse($this->backend->inGroup($user1, $group1)); + $this->assertFalse($this->backend->inGroup($user2, $group1)); + $this->assertFalse($this->backend->inGroup($user1, $group2)); + $this->assertFalse($this->backend->inGroup($user2, $group2)); - $this->assertTrue($this->backend->addToGroup($user1,$group1)); + $this->assertTrue($this->backend->addToGroup($user1, $group1)); - $this->assertTrue($this->backend->inGroup($user1,$group1)); - $this->assertFalse($this->backend->inGroup($user2,$group1)); - $this->assertFalse($this->backend->inGroup($user1,$group2)); - $this->assertFalse($this->backend->inGroup($user2,$group2)); + $this->assertTrue($this->backend->inGroup($user1, $group1)); + $this->assertFalse($this->backend->inGroup($user2, $group1)); + $this->assertFalse($this->backend->inGroup($user1, $group2)); + $this->assertFalse($this->backend->inGroup($user2, $group2)); - $this->assertFalse($this->backend->addToGroup($user1,$group1)); + $this->assertFalse($this->backend->addToGroup($user1, $group1)); - $this->assertEqual(array($user1),$this->backend->usersInGroup($group1)); - $this->assertEqual(array(),$this->backend->usersInGroup($group2)); + $this->assertEqual(array($user1), $this->backend->usersInGroup($group1)); + $this->assertEqual(array(), $this->backend->usersInGroup($group2)); - $this->assertEqual(array($group1),$this->backend->getUserGroups($user1)); - $this->assertEqual(array(),$this->backend->getUserGroups($user2)); + $this->assertEqual(array($group1), $this->backend->getUserGroups($user1)); + $this->assertEqual(array(), $this->backend->getUserGroups($user2)); $this->backend->deleteGroup($group1); - $this->assertEqual(array(),$this->backend->getUserGroups($user1)); - $this->assertEqual(array(),$this->backend->usersInGroup($group1)); - $this->assertFalse($this->backend->inGroup($user1,$group1)); + $this->assertEqual(array(), $this->backend->getUserGroups($user1)); + $this->assertEqual(array(), $this->backend->usersInGroup($group1)); + $this->assertFalse($this->backend->inGroup($user1, $group1)); } } diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php index 3cad3a28680..2cb6f7417d2 100644 --- a/tests/lib/share/share.php +++ b/tests/lib/share/share.php @@ -181,7 +181,7 @@ class Test_Share extends UnitTestCase { $this->assertEquals($message, $exception->getMessage()); } - // Owner grants share and update permission + // Owner grants share and update permission OC_User::setUserId($this->user1); $this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_SHARE)); @@ -375,7 +375,7 @@ class Test_Share extends UnitTestCase { $this->assertTrue(in_array('test.txt', $to_test)); $this->assertTrue(in_array('test1.txt', $to_test)); - // Valid reshare + // Valid reshare $this->assertTrue(OCP\Share::shareItem('test', 'share.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE)); OC_User::setUserId($this->user4); $this->assertEquals(array('test1.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET)); diff --git a/tests/lib/streamwrappers.php b/tests/lib/streamwrappers.php index 46838ff9754..89b2785fca6 100644 --- a/tests/lib/streamwrappers.php +++ b/tests/lib/streamwrappers.php @@ -22,7 +22,7 @@ class Test_StreamWrappers extends UnitTestCase { public function testFakeDir() { - $items=array('foo','bar'); + $items=array('foo', 'bar'); OC_FakeDirStream::$dirs['test']=$items; $dh=opendir('fakedir://test'); $result=array(); @@ -30,16 +30,16 @@ class Test_StreamWrappers extends UnitTestCase { $result[]=$file; $this->assertContains($file, $items); } - $this->assertEqual(count($items),count($result)); + $this->assertEqual(count($items), count($result)); } public function testStaticStream() { $sourceFile=OC::$SERVERROOT.'/tests/data/lorem.txt'; $staticFile='static://test'; $this->assertFalse(file_exists($staticFile)); - file_put_contents($staticFile,file_get_contents($sourceFile)); + file_put_contents($staticFile, file_get_contents($sourceFile)); $this->assertTrue(file_exists($staticFile)); - $this->assertEqual(file_get_contents($sourceFile),file_get_contents($staticFile)); + $this->assertEqual(file_get_contents($sourceFile), file_get_contents($staticFile)); unlink($staticFile); clearstatcache(); $this->assertFalse(file_exists($staticFile)); @@ -51,8 +51,8 @@ class Test_StreamWrappers extends UnitTestCase { $tmpFile=OC_Helper::TmpFile('.txt'); $file='close://'.$tmpFile; $this->assertTrue(file_exists($file)); - file_put_contents($file,file_get_contents($sourceFile)); - $this->assertEqual(file_get_contents($sourceFile),file_get_contents($file)); + file_put_contents($file, file_get_contents($sourceFile)); + $this->assertEqual(file_get_contents($sourceFile), file_get_contents($file)); unlink($file); clearstatcache(); $this->assertFalse(file_exists($file)); @@ -60,15 +60,15 @@ class Test_StreamWrappers extends UnitTestCase { //test callback $tmpFile=OC_Helper::TmpFile('.txt'); $file='close://'.$tmpFile; - OC_CloseStreamWrapper::$callBacks[$tmpFile]=array('Test_StreamWrappers','closeCallBack'); - $fh=fopen($file,'w'); - fwrite($fh,'asd'); + OC_CloseStreamWrapper::$callBacks[$tmpFile]=array('Test_StreamWrappers', 'closeCallBack'); + $fh=fopen($file, 'w'); + fwrite($fh, 'asd'); try{ fclose($fh); $this->fail('Expected exception'); }catch(Exception $e) { $path=$e->getMessage(); - $this->assertEqual($path,$tmpFile); + $this->assertEqual($path, $tmpFile); } } diff --git a/tests/lib/template.php b/tests/lib/template.php new file mode 100644 index 00000000000..736bc95255c --- /dev/null +++ b/tests/lib/template.php @@ -0,0 +1,71 @@ +<?php +/** +* ownCloud +* +* @author Bernhard Posselt +* @copyright 2012 Bernhard Posselt nukeawhale@gmail.com +* +* 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 <http://www.gnu.org/licenses/>. +* +*/ + +OC::autoload('OC_Template'); + +class Test_TemplateFunctions extends UnitTestCase { + + public function testP() { + // FIXME: do we need more testcases? + $htmlString = "<script>alert('xss');</script>"; + ob_start(); + p($htmlString); + $result = ob_get_clean(); + ob_end_clean(); + + $this->assertEqual("<script>alert('xss');</script>", $result); + } + + public function testPNormalString() { + $normalString = "This is a good string!"; + ob_start(); + p($normalString); + $result = ob_get_clean(); + ob_end_clean(); + + $this->assertEqual("This is a good string!", $result); + } + + + public function testPrintUnescaped() { + $htmlString = "<script>alert('xss');</script>"; + + ob_start(); + print_unescaped($htmlString); + $result = ob_get_clean(); + ob_end_clean(); + + $this->assertEqual($htmlString, $result); + } + + public function testPrintUnescapedNormalString() { + $normalString = "This is a good string!"; + ob_start(); + print_unescaped($normalString); + $result = ob_get_clean(); + ob_end_clean(); + + $this->assertEqual("This is a good string!", $result); + } + + +} diff --git a/tests/lib/user/backend.php b/tests/lib/user/backend.php index c69c1bad512..0b744770ea2 100644 --- a/tests/lib/user/backend.php +++ b/tests/lib/user/backend.php @@ -23,10 +23,10 @@ /** * Abstract class to provide the basis of backend-specific unit test classes. * - * All subclasses MUST assign a backend property in setUp() which implements + * All subclasses MUST assign a backend property in setUp() which implements * user operations (add, remove, etc.). Test methods in this class will then be * run on each separate subclass and backend therein. - * + * * For an example see /tests/lib/user/dummy.php */ @@ -51,22 +51,22 @@ abstract class Test_User_Backend extends UnitTestCase { $name1=$this->getUser(); $name2=$this->getUser(); - $this->backend->createUser($name1,''); + $this->backend->createUser($name1, ''); $count=count($this->backend->getUsers())-$startCount; - $this->assertEqual(1,$count); - $this->assertTrue((array_search($name1,$this->backend->getUsers())!==false)); - $this->assertFalse((array_search($name2,$this->backend->getUsers())!==false)); - $this->backend->createUser($name2,''); + $this->assertEqual(1, $count); + $this->assertTrue((array_search($name1, $this->backend->getUsers())!==false)); + $this->assertFalse((array_search($name2, $this->backend->getUsers())!==false)); + $this->backend->createUser($name2, ''); $count=count($this->backend->getUsers())-$startCount; - $this->assertEqual(2,$count); - $this->assertTrue((array_search($name1,$this->backend->getUsers())!==false)); - $this->assertTrue((array_search($name2,$this->backend->getUsers())!==false)); + $this->assertEqual(2, $count); + $this->assertTrue((array_search($name1, $this->backend->getUsers())!==false)); + $this->assertTrue((array_search($name2, $this->backend->getUsers())!==false)); $this->backend->deleteUser($name2); $count=count($this->backend->getUsers())-$startCount; - $this->assertEqual(1,$count); - $this->assertTrue((array_search($name1,$this->backend->getUsers())!==false)); - $this->assertFalse((array_search($name2,$this->backend->getUsers())!==false)); + $this->assertEqual(1, $count); + $this->assertTrue((array_search($name1, $this->backend->getUsers())!==false)); + $this->assertFalse((array_search($name2, $this->backend->getUsers())!==false)); } public function testLogin() { @@ -76,24 +76,24 @@ abstract class Test_User_Backend extends UnitTestCase { $this->assertFalse($this->backend->userExists($name1)); $this->assertFalse($this->backend->userExists($name2)); - $this->backend->createUser($name1,'pass1'); - $this->backend->createUser($name2,'pass2'); + $this->backend->createUser($name1, 'pass1'); + $this->backend->createUser($name2, 'pass2'); $this->assertTrue($this->backend->userExists($name1)); $this->assertTrue($this->backend->userExists($name2)); - $this->assertTrue($this->backend->checkPassword($name1,'pass1')); - $this->assertTrue($this->backend->checkPassword($name2,'pass2')); + $this->assertTrue($this->backend->checkPassword($name1, 'pass1')); + $this->assertTrue($this->backend->checkPassword($name2, 'pass2')); - $this->assertFalse($this->backend->checkPassword($name1,'pass2')); - $this->assertFalse($this->backend->checkPassword($name2,'pass1')); + $this->assertFalse($this->backend->checkPassword($name1, 'pass2')); + $this->assertFalse($this->backend->checkPassword($name2, 'pass1')); - $this->assertFalse($this->backend->checkPassword($name1,'dummy')); - $this->assertFalse($this->backend->checkPassword($name2,'foobar')); + $this->assertFalse($this->backend->checkPassword($name1, 'dummy')); + $this->assertFalse($this->backend->checkPassword($name2, 'foobar')); - $this->backend->setPassword($name1,'newpass1'); - $this->assertFalse($this->backend->checkPassword($name1,'pass1')); - $this->assertTrue($this->backend->checkPassword($name1,'newpass1')); - $this->assertFalse($this->backend->checkPassword($name2,'newpass1')); + $this->backend->setPassword($name1, 'newpass1'); + $this->assertFalse($this->backend->checkPassword($name1, 'pass1')); + $this->assertTrue($this->backend->checkPassword($name1, 'newpass1')); + $this->assertFalse($this->backend->checkPassword($name2, 'newpass1')); } } diff --git a/tests/lib/util.php b/tests/lib/util.php index a8e5b810265..27635cb8055 100644 --- a/tests/lib/util.php +++ b/tests/lib/util.php @@ -10,7 +10,7 @@ class Test_Util extends UnitTestCase { // Constructor function Test_Util() { - date_default_timezone_set("UTC"); + date_default_timezone_set("UTC"); } function testFormatDate() { @@ -36,10 +36,10 @@ class Test_Util extends UnitTestCase { $goodString = "This is an harmless string."; $result = OC_Util::sanitizeHTML($goodString); $this->assertEquals("This is an harmless string.", $result); - } + } function testGenerate_random_bytes() { $result = strlen(OC_Util::generate_random_bytes(59)); $this->assertEquals(59, $result); - } + } }
\ No newline at end of file diff --git a/tests/preseed-config.php b/tests/preseed-config.php index 7eadccbe769..9791e713dac 100644 --- a/tests/preseed-config.php +++ b/tests/preseed-config.php @@ -1,15 +1,15 @@ <?php $CONFIG = array ( "appstoreenabled" => false, - 'apps_paths' => + 'apps_paths' => array ( - 0 => + 0 => array ( 'path' => OC::$SERVERROOT.'/apps', 'url' => '/apps', 'writable' => false, ), - 1 => + 1 => array ( 'path' => OC::$SERVERROOT.'/apps2', 'url' => '/apps2', |