diff options
154 files changed, 5023 insertions, 2095 deletions
diff --git a/3rdparty b/3rdparty -Subproject 25e8568d41a9b9a6d1662ccf33058822a890e7f +Subproject 72db6ce87d69f00ce62d2f3f277a54f6fdd0f69 diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php index 6c92cc80b69..9b114ca2e37 100644 --- a/apps/files/appinfo/remote.php +++ b/apps/files/appinfo/remote.php @@ -23,7 +23,7 @@ * */ // load needed apps -$RUNTIME_APPTYPES=array('filesystem', 'authentication', 'logging'); +$RUNTIME_APPTYPES = array('filesystem', 'authentication', 'logging'); OC_App::loadApps($RUNTIME_APPTYPES); @@ -35,15 +35,17 @@ $lockBackend = new OC_Connector_Sabre_Locks(); $requestBackend = new OC_Connector_Sabre_Request(); // Create ownCloud Dir -$publicDir = new OC_Connector_Sabre_Directory(''); +$rootDir = new OC_Connector_Sabre_Directory(''); +$objectTree = new \OC\Connector\Sabre\ObjectTree($rootDir); // Fire up server -$server = new Sabre_DAV_Server($publicDir); +$server = new Sabre_DAV_Server($objectTree); $server->httpRequest = $requestBackend; $server->setBaseUri($baseuri); // Load plugins -$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud')); +$defaults = new OC_Defaults(); +$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, $defaults->getName())); $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()); diff --git a/apps/files_external/lib/irods.php b/apps/files_external/lib/irods.php index ddce8639ff4..a343ac5fb27 100644 --- a/apps/files_external/lib/irods.php +++ b/apps/files_external/lib/irods.php @@ -11,8 +11,10 @@ namespace OC\Files\Storage; set_include_path(get_include_path() . PATH_SEPARATOR . \OC_App::getAppPath('files_external') . '/3rdparty/irodsphp/prods/src'); +ob_start(); require_once 'ProdsConfig.inc.php'; require_once 'ProdsStreamer.class.php'; +ob_end_clean(); class iRODS extends \OC\Files\Storage\StreamWrapper{ private $password; diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index e8bf80b8720..746a715f3cc 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -2,16 +2,14 @@ <div id="notification" style="display: none;"></div> </div> -<?php $defaults = new OCP\Defaults(); // initialize themable default strings and urls ?> - <input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir"> <input type="hidden" name="downloadURL" value="<?php p($_['downloadURL']) ?>" id="downloadURL"> <input type="hidden" name="filename" value="<?php p($_['filename']) ?>" id="filename"> <input type="hidden" name="mimetype" value="<?php p($_['mimetype']) ?>" id="mimetype"> <header><div id="header"> <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg" - src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="ownCloud" /></a> - <div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div> + src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a> + <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> <div class="header-right"> <?php if (isset($_['folder'])): ?> <span id="details"><?php p($l->t('%s shared the folder %s with you', @@ -95,6 +93,6 @@ </div> <footer> <p class="info"> - <?php print_unescaped($defaults->getLongFooter()); ?> + <?php print_unescaped($theme->getLongFooter()); ?> </p> </footer> diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php index f9174c45a65..4f48f71d8ca 100644 --- a/apps/files_versions/ajax/getVersions.php +++ b/apps/files_versions/ajax/getVersions.php @@ -2,24 +2,22 @@ OCP\JSON::checkAppEnabled('files_versions'); $source = $_GET['source']; +$start = $_GET['start']; list ($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($source); $count = 5; //show the newest revisions -if( ($versions = OCA\Files_Versions\Storage::getVersions($uid, $filename, $count)) ) { +if( ($versions = OCA\Files_Versions\Storage::getVersions($uid, $filename)) ) { - $versionsFormatted = array(); - - foreach ( $versions AS $version ) { - $versionsFormatted[] = OCP\Util::formatDate( $version['version'] ); + $endReached = false; + if (count($versions) <= $start+$count) { + $endReached = true; } - $versionsSorted = array_reverse( $versions ); + $versions = array_slice($versions, $start, $count); - if ( !empty( $versionsSorted ) ) { - OCP\JSON::encodedPrint($versionsSorted); - } + \OCP\JSON::success(array('data' => array('versions' => $versions, 'endReached' => $endReached))); } else { - return; + \OCP\JSON::success(array('data' => array('versions' => false, 'endReached' => true))); } diff --git a/apps/files_versions/ajax/rollbackVersion.php b/apps/files_versions/ajax/rollbackVersion.php index 284b46ee093..900d8cd6e28 100644 --- a/apps/files_versions/ajax/rollbackVersion.php +++ b/apps/files_versions/ajax/rollbackVersion.php @@ -3,8 +3,6 @@ OCP\JSON::checkAppEnabled('files_versions'); OCP\JSON::callCheck(); -$userDirectory = "/".OCP\USER::getUser()."/files"; - $file = $_GET['file']; $revision=(int)$_GET['revision']; diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php index 0d0850e1864..5b1e464ba6c 100644 --- a/apps/files_versions/appinfo/app.php +++ b/apps/files_versions/appinfo/app.php @@ -6,6 +6,7 @@ OC::$CLASSPATH['OCA\Files_Versions\Hooks'] = 'files_versions/lib/hooks.php'; OC::$CLASSPATH['OCA\Files_Versions\Capabilities'] = 'files_versions/lib/capabilities.php'; OCP\Util::addscript('files_versions', 'versions'); +OCP\Util::addStyle('files_versions', 'versions'); // Listen to write signals OCP\Util::connectHook('OC_Filesystem', 'write', "OCA\Files_Versions\Hooks", "write_hook"); diff --git a/apps/files_versions/css/versions.css b/apps/files_versions/css/versions.css index a9b259ce140..6146eda3372 100644 --- a/apps/files_versions/css/versions.css +++ b/apps/files_versions/css/versions.css @@ -1,16 +1,44 @@ -#history { - margin: 2em 2em 0; +#found_versions li { + width: 100%; + cursor: default; + height: 36px; + float: left; + border-bottom: 1px solid rgba(100,100,100,.1); +} +#found_versions li:last-child { + border-bottom: none; +} + +#found_versions li > * { + padding: 7px; + float: left; + vertical-align: top; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; + filter: alpha(opacity=50); + opacity: .5; +} +#found_versions li > *:hover, +#found_versions li > *:focus { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; + filter: alpha(opacity=100); + opacity: 1; } -#feedback-messages h3 { - font-size: 1.3em; - font-style: italic; +#found_versions img { + cursor: pointer; + padding-right: 4px; } -.success { - color: green; +#found_versions .versionDate { + min-width: 100px; + vertical-align: text-bottom; } -.failure { - color: red; -}
\ No newline at end of file +#found_versions .revertVersion { + cursor: pointer; + float: right; +} + +.drop-versions #makelink { + float: left; +} diff --git a/apps/files_versions/download.php b/apps/files_versions/download.php new file mode 100644 index 00000000000..040a662e61b --- /dev/null +++ b/apps/files_versions/download.php @@ -0,0 +1,50 @@ +<?php + +/** +* ownCloud - Download versions directly from the versions drop-down +* +* @author Bjoern Schiessle +* @copyright 2013 Bjoern Schiessle schiessle@owncloud.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/>. +* +*/ + +OCP\JSON::checkAppEnabled('files_versions'); +//OCP\JSON::callCheck(); + +$file = $_GET['file']; +$revision=(int)$_GET['revision']; + +list($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($file); + +$versionName = '/'.$uid.'/files_versions/'.$filename.'.v'.$revision; + +$view = new OC\Files\View('/'); + +$ftype = $view->getMimeType('/'.$uid.'/files/'.$filename); + +header('Content-Type:'.$ftype); +if ( preg_match( "/MSIE/", $_SERVER["HTTP_USER_AGENT"] ) ) { + header( 'Content-Disposition: attachment; filename="' . rawurlencode( basename($filename) ) . '"' ); +} else { + header( 'Content-Disposition: attachment; filename*=UTF-8\'\'' . rawurlencode( basename($filename) ) + . '; filename="' . rawurlencode( basename($filename) ) . '"' ); +} +OCP\Response::disableCaching(); +header('Content-Length: '.$view->filesize($versionName)); + +OC_Util::obEnd(); + +$view->readfile($versionName); diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php deleted file mode 100644 index 719a7208fed..00000000000 --- a/apps/files_versions/history.php +++ /dev/null @@ -1,78 +0,0 @@ -<?php - -/** - * ownCloud - History page of the Versions App - * - * @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 - * 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 Lesser General Public - * License along with this library. If not, see <http://www.gnu.org/licenses/>. - * - */ - -OCP\User::checkLoggedIn( ); -OCP\Util::addStyle('files_versions', 'versions'); -$tmpl = new OCP\Template( 'files_versions', 'history', 'user' ); -$l = OC_L10N::get('files_versions'); - -if ( isset( $_GET['path'] ) ) { - - $path = $_GET['path']; - $tmpl->assign( 'path', $path ); - $versions = new OCA\Files_Versions\Storage(); - - // roll back to old version if button clicked - if( isset( $_GET['revert'] ) ) { - - if( $versions->rollback( $path, $_GET['revert'] ) ) { - - $tmpl->assign( 'outcome_stat', $l->t('success') ); - - $message = $l->t('File %s was reverted to version %s', - array($_GET['path'], OCP\Util::formatDate( doubleval($_GET['revert']) ) ) ); - - $tmpl->assign( 'outcome_msg', $message); - - } else { - - $tmpl->assign( 'outcome_stat', $l->t('failure') ); - - $message = $l->t('File %s could not be reverted to version %s', - array($_GET['path'], OCP\Util::formatDate( doubleval($_GET['revert']) ) ) ); - - $tmpl->assign( 'outcome_msg', $message); - - } - - } - - // show the history only if there is something to show - $count = 999; //show the newest revisions - list ($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($path); - if( ($versions = OCA\Files_Versions\Storage::getVersions($uid, $filename, $count)) ) { - - $tmpl->assign( 'versions', array_reverse( $versions ) ); - - }else{ - - $tmpl->assign( 'message', $l->t('No old versions available') ); - - } -}else{ - - $tmpl->assign( 'message', $l->t('No path specified') ); - -} - -$tmpl->printPage( ); diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js index a5b24417483..ca479507d48 100644 --- a/apps/files_versions/js/versions.js +++ b/apps/files_versions/js/versions.js @@ -1,4 +1,5 @@ $(document).ready(function(){ + if (typeof FileActions !== 'undefined') { // Add versions button to 'files/index.php' FileActions.register( @@ -14,39 +15,68 @@ $(document).ready(function(){ if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback var file = $('#dir').val()+'/'+filename; + var createDropDown = true; // Check if drop down is already visible for a different file - if (($('#dropdown').length > 0) && $('#dropdown').hasClass('drop-versions') ) { - if (file != $('#dropdown').data('file')) { - $('#dropdown').hide('blind', function() { - $('#dropdown').remove(); - $('tr').removeClass('mouseOver'); - createVersionsDropdown(filename, file); - }); + if (($('#dropdown').length > 0) ) { + if ( $('#dropdown').hasClass('drop-versions') && file == $('#dropdown').data('file')) { + createDropDown = false; } - } else { + $('#dropdown').remove(); + $('tr').removeClass('mouseOver'); + } + + if(createDropDown === true) { createVersionsDropdown(filename, file); } } ); } + + $(document).on("click", 'span[class="revertVersion"]', function() { + var revision = $(this).attr('id'); + var file = $(this).attr('value'); + revertFile(file, revision); + }); + }); +function revertFile(file, revision) { + + $.ajax({ + type: 'GET', + url: OC.linkTo('files_versions', 'ajax/rollbackVersion.php'), + dataType: 'json', + data: {file: file, revision: revision}, + async: false, + success: function(response) { + if (response.status === 'error') { + OC.Notification.show( t('files_version', 'Failed to revert {file} to revision {timestamp}.', {file:file, timestamp:formatDate(revision * 1000)}) ); + } else { + $('#dropdown').hide('blind', function() { + $('#dropdown').remove(); + $('tr').removeClass('mouseOver'); + // TODO also update the modified time in the web ui + }); + } + } + }); + +} + function goToVersionPage(url){ window.location.assign(url); } function createVersionsDropdown(filename, files) { - var historyUrl = OC.linkTo('files_versions', 'history.php') + '?path='+encodeURIComponent( $( '#dir' ).val() ).replace( /%2F/g, '/' )+'/'+encodeURIComponent( filename ); + var start = 0; var html = '<div id="dropdown" class="drop drop-versions" data-file="'+escapeHTML(files)+'">'; html += '<div id="private">'; - html += '<select data-placeholder="Saved versions" id="found_versions" class="chzen-select" style="width:16em;">'; - html += '<option value=""></option>'; - html += '</select>'; + html += '<ul id="found_versions">'; + html += '</ul>'; html += '</div>'; - html += '<input type="button" value="All versions..." name="makelink" id="makelink" />'; - html += '<input id="link" style="display:none; width:90%;" />'; + html += '<input type="button" value="'+ t('files_versions', 'More versions...') + '" name="show-more-versions" id="show-more-versions" style="display: none;" />'; if (filename) { $('tr').filterAttr('data-file',filename).addClass('mouseOver'); @@ -55,73 +85,72 @@ function createVersionsDropdown(filename, files) { $(html).appendTo($('thead .share')); } - $("#makelink").click(function() { - goToVersionPage(historyUrl); - }); + getVersions(start); + start = start + 5; - $.ajax({ - type: 'GET', - url: OC.filePath('files_versions', 'ajax', 'getVersions.php'), - dataType: 'json', - data: { source: files }, - async: false, - success: function( versions ) { - - if (versions) { - $.each( versions, function(index, row ) { - addVersion( row ); - }); - } else { - $('#found_versions').hide(); - $('#makelink').hide(); - $('<div style="text-align:center;">No other versions available</div>').appendTo('#dropdown'); - } - $('#found_versions').change(function(){ - var revision=parseInt($(this).val()); - revertFile(files,revision); - }); - } + $("#show-more-versions").click(function() { + //get more versions + getVersions(start); + start = start + 5; }); - function revertFile(file, revision) { - + function getVersions(start) { $.ajax({ type: 'GET', - url: OC.linkTo('files_versions', 'ajax/rollbackVersion.php'), + url: OC.filePath('files_versions', 'ajax', 'getVersions.php'), dataType: 'json', - data: {file: file, revision: revision}, + data: {source: files, start: start}, async: false, - success: function(response) { - if (response.status=='error') { - OC.dialogs.alert('Failed to revert '+file+' to revision '+formatDate(revision*1000)+'.','Failed to revert'); + success: function(result) { + var versions = result.data.versions; + if (result.data.endReached === true) { + document.getElementById("show-more-versions").style.display="none"; } else { - $('#dropdown').hide('blind', function() { - $('#dropdown').remove(); - $('tr').removeClass('mouseOver'); - // TODO also update the modified time in the web ui + document.getElementById("show-more-versions").style.display="block"; + } + if (versions) { + $.each(versions, function(index, row) { + addVersion(row); }); + } else { + $('<div style="text-align:center;">'+ t('files_versions', 'No other versions available') + '</div>').appendTo('#dropdown'); } + $('#found_versions').change(function() { + var revision = parseInt($(this).val()); + revertFile(files, revision); + }); } }); - } function addVersion( revision ) { - name=formatDate(revision.version*1000); - var version=$('<option/>'); - version.attr('value',revision.version); - version.text(name); - -// } else { -// var checked = ((permissions > 0) ? 'checked="checked"' : 'style="display:none;"'); -// var style = ((permissions == 0) ? 'style="display:none;"' : ''); -// var user = '<li data-uid_shared_with="'+uid_shared_with+'">'; -// user += '<a href="" class="unshare" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core','actions/delete')+'"/></a>'; -// user += uid_shared_with; -// user += '<input type="checkbox" name="permissions" id="'+uid_shared_with+'" class="permissions" '+checked+' />'; -// user += '<label for="'+uid_shared_with+'" '+style+'>can edit</label>'; -// user += '</li>'; -// } + title = formatDate(revision.version*1000); + name ='<span class="versionDate" title="' + title + '">' + revision.humanReadableTimestamp + '</span>'; + + path = OC.filePath('files_versions', '', 'download.php'); + + download ='<a href="' + path + "?file=" + files + '&revision=' + revision.version + '">'; + download+='<img'; + download+=' src="' + OC.imagePath('core', 'actions/download') + '"'; + download+=' id="' + revision.version + '"'; + download+=' value="' + files + '"'; + download+=' name="downloadVersion" />'; + download+=name; + download+='</a>'; + + revert='<span class="revertVersion"'; + revert+=' id="' + revision.version + '"'; + revert+=' value="' + files + '">'; + revert+='<img'; + revert+=' src="' + OC.imagePath('core', 'actions/history') + '"'; + revert+=' id="' + revision.version + '"'; + revert+=' value="' + files + '"'; + revert+=' name="revertVersion"'; + revert+='/>'+t('files_versions', 'Restore')+'</span>'; + + var version=$('<li/>'); + version.attr('value', revision.version); + version.html(download + revert); version.appendTo('#found_versions'); } diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index c083a000c37..7c75d70f79c 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -239,10 +239,9 @@ class Storage { * @brief get a list of all available versions of a file in descending chronological order * @param $uid user id from the owner of the file * @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($uid, $filename, $count = 0 ) { + public static function getVersions($uid, $filename ) { if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) { $versions_fileview = new \OC\Files\View('/' . $uid . '/files_versions'); $versionsName = $versions_fileview->getLocalFile($filename).'.v'; @@ -268,6 +267,7 @@ class Storage { $key = $version.'#'.$filename; $versions[$key]['cur'] = 0; $versions[$key]['version'] = $version; + $versions[$key]['humanReadableTimestamp'] = self::getHumanReadableTimestamp($version); $versions[$key]['path'] = $filename; $versions[$key]['size'] = $versions_fileview->filesize($filename.'.v'.$version); @@ -276,6 +276,7 @@ class Storage { } + // newest versions first $versions = array_reverse( $versions ); foreach( $versions as $key => $value ) { @@ -286,13 +287,6 @@ class Storage { } } - $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 { @@ -302,6 +296,32 @@ class Storage { } + /** + * @brief translate a timestamp into a string like "5 days ago" + * @param int $timestamp + * @return string for example "5 days ago" + */ + private static function getHumanReadableTimestamp($timestamp) { + + $diff = time() - $timestamp; + + if ($diff < 60) { // first minute + return $diff . " seconds ago"; + } elseif ($diff < 3600) { //first hour + return round($diff / 60) . " minutes ago"; + } elseif ($diff < 86400) { // first day + return round($diff / 3600) . " hours ago"; + } elseif ($diff < 604800) { //first week + return round($diff / 86400) . " days ago"; + } elseif ($diff < 2419200) { //first month + return round($diff / 604800) . " weeks ago"; + } elseif ($diff < 29030400) { // first year + return round($diff / 2419200) . " months ago"; + } else { + return round($diff / 29030400) . " years ago"; + } + + } /** * @brief deletes used space for files versions in db if user was deleted diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php deleted file mode 100644 index 3a6d5f0c9e7..00000000000 --- a/apps/files_versions/templates/history.php +++ /dev/null @@ -1,36 +0,0 @@ -<div id="history"> - -<?php - -if( isset( $_['message'] ) ) { - - - if( isset($_['path'] ) ) print_unescaped('<strong>File: '.OC_Util::sanitizeHTML($_['path']).'</strong><br>'); - print_unescaped('<strong>'.OC_Util::sanitizeHTML($_['message']) .'</strong><br>'); - -}else{ - - if( isset( $_['outcome_stat'] ) ) { - - print_unescaped( '<div id="feedback-messages" class="'.OC_Util::sanitizeHTML($_['outcome_stat']).'"><h3>'.OC_Util::sanitizeHTML($_['outcome_msg']).'</h3></div><br>'); - - } - - print_unescaped( '<strong>Versions of '.OC_Util::sanitizeHTML($_['path']).'</strong><br>'); - print_unescaped('<p><em>'.OC_Util::sanitizeHTML($l->t('Revert a file to a previous version by clicking on its revert button')).'</em></p><br />'); - - foreach ( $_['versions'] as $v ) { - p(' '); - p(OCP\Util::formatDate( doubleval($v['version']))); - print_unescaped(' <a href="'.OCP\Util::linkTo('files_versions', 'history.php', - array('path' => $_['path'], 'revert' => $v['version'])) .'" class="button">Revert</a><br /><br />'); - if ( $v['cur'] ) { - print_unescaped(' (<b>Current</b>)'); - } - print_unescaped('<br /><br />'); - } - -} - -?> -</div> diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php index 972970aa3ef..95aa592594b 100644 --- a/apps/user_ldap/templates/settings.php +++ b/apps/user_ldap/templates/settings.php @@ -6,7 +6,7 @@ <li><a href="#ldapSettings-3">Expert</a></li> </ul> <?php if(OCP\App::isEnabled('user_webdavauth')) { - print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them.').'</p>'); + print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.').'</p>'); } if(!function_exists('ldap_connect')) { print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>'); @@ -72,18 +72,18 @@ <p><label for="ldap_port"><?php p($l->t('Port'));?></label><input type="number" id="ldap_port" name="ldap_port" data-default="<?php p($_['ldap_port_default']); ?>" /></p> <p><label for="ldap_backup_host"><?php p($l->t('Backup (Replica) Host'));?></label><input type="text" id="ldap_backup_host" name="ldap_backup_host" data-default="<?php p($_['ldap_backup_host_default']); ?>" title="<?php p($l->t('Give an optional backup host. It must be a replica of the main LDAP/AD server.'));?>"></p> <p><label for="ldap_backup_port"><?php p($l->t('Backup (Replica) Port'));?></label><input type="number" id="ldap_backup_port" name="ldap_backup_port" data-default="<?php p($_['ldap_backup_port_default']); ?>" /></p> - <p><label for="ldap_override_main_server"><?php p($l->t('Disable Main Server'));?></label><input type="checkbox" id="ldap_override_main_server" name="ldap_override_main_server" value="1" data-default="<?php p($_['ldap_override_main_server_default']); ?>" title="<?php p($l->t('When switched on, ownCloud will only connect to the replica server.'));?>" /></p> + <p><label for="ldap_override_main_server"><?php p($l->t('Disable Main Server'));?></label><input type="checkbox" id="ldap_override_main_server" name="ldap_override_main_server" value="1" data-default="<?php p($_['ldap_override_main_server_default']); ?>" title="<?php p($l->t('Only connect to the replica server.'));?>" /></p> <p><label for="ldap_tls"><?php p($l->t('Use TLS'));?></label><input type="checkbox" id="ldap_tls" name="ldap_tls" value="1" data-default="<?php p($_['ldap_tls_default']); ?>" title="<?php p($l->t('Do not use it additionally for LDAPS connections, it will fail.'));?>" /></p> <p><label for="ldap_nocase"><?php p($l->t('Case insensitve LDAP server (Windows)'));?></label><input type="checkbox" id="ldap_nocase" name="ldap_nocase" data-default="<?php p($_['ldap_nocase_default']); ?>" value="1"<?php if (isset($_['ldap_nocase']) && ($_['ldap_nocase'])) p(' checked'); ?>></p> - <p><label for="ldap_turn_off_cert_check"><?php p($l->t('Turn off SSL certificate validation.'));?></label><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php p($l->t('If connection only works with this option, import the LDAP server\'s SSL certificate in your ownCloud server.'));?>" data-default="<?php p($_['ldap_turn_off_cert_check_default']); ?>" value="1"><br/><small><?php p($l->t('Not recommended, use for testing only.'));?></small></p> + <p><label for="ldap_turn_off_cert_check"><?php p($l->t('Turn off SSL certificate validation.'));?></label><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php p($l->t('If connection only works with this option, import the LDAP server\'s SSL certificate in your %s server.', $theme->getName() ));?>" data-default="<?php p($_['ldap_turn_off_cert_check_default']); ?>" value="1"><br/><small><?php p($l->t('Not recommended, use for testing only.'));?></small></p> <p><label for="ldap_cache_ttl"><?php p($l->t('Cache Time-To-Live'));?></label><input type="number" id="ldap_cache_ttl" name="ldap_cache_ttl" title="<?php p($l->t('in seconds. A change empties the cache.'));?>" data-default="<?php p($_['ldap_cache_ttl_default']); ?>" /></p> </div> <h3><?php p($l->t('Directory Settings'));?></h3> <div> - <p><label for="ldap_display_name"><?php p($l->t('User Display Name Field'));?></label><input type="text" id="ldap_display_name" name="ldap_display_name" data-default="<?php p($_['ldap_display_name_default']); ?>" title="<?php p($l->t('The LDAP attribute to use to generate the user`s ownCloud name.'));?>" /></p> + <p><label for="ldap_display_name"><?php p($l->t('User Display Name Field'));?></label><input type="text" id="ldap_display_name" name="ldap_display_name" data-default="<?php p($_['ldap_display_name_default']); ?>" title="<?php p($l->t('The LDAP attribute to use to generate the user\'s display name.'));?>" /></p> <p><label for="ldap_base_users"><?php p($l->t('Base User Tree'));?></label><textarea id="ldap_base_users" name="ldap_base_users" placeholder="<?php p($l->t('One User Base DN per line'));?>" data-default="<?php p($_['ldap_base_users_default']); ?>" title="<?php p($l->t('Base User Tree'));?>"></textarea></p> <p><label for="ldap_attributes_for_user_search"><?php p($l->t('User Search Attributes'));?></label><textarea id="ldap_attributes_for_user_search" name="ldap_attributes_for_user_search" placeholder="<?php p($l->t('Optional; one attribute per line'));?>" data-default="<?php p($_['ldap_attributes_for_user_search_default']); ?>" title="<?php p($l->t('User Search Attributes'));?>"></textarea></p> - <p><label for="ldap_group_display_name"><?php p($l->t('Group Display Name Field'));?></label><input type="text" id="ldap_group_display_name" name="ldap_group_display_name" data-default="<?php p($_['ldap_group_display_name_default']); ?>" title="<?php p($l->t('The LDAP attribute to use to generate the groups`s ownCloud name.'));?>" /></p> + <p><label for="ldap_group_display_name"><?php p($l->t('Group Display Name Field'));?></label><input type="text" id="ldap_group_display_name" name="ldap_group_display_name" data-default="<?php p($_['ldap_group_display_name_default']); ?>" title="<?php p($l->t('The LDAP attribute to use to generate the groups\'s display name.'));?>" /></p> <p><label for="ldap_base_groups"><?php p($l->t('Base Group Tree'));?></label><textarea id="ldap_base_groups" name="ldap_base_groups" placeholder="<?php p($l->t('One Group Base DN per line'));?>" data-default="<?php p($_['ldap_base_groups_default']); ?>" title="<?php p($l->t('Base Group Tree'));?>"></textarea></p> <p><label for="ldap_attributes_for_group_search"><?php p($l->t('Group Search Attributes'));?></label><textarea id="ldap_attributes_for_group_search" name="ldap_attributes_for_group_search" placeholder="<?php p($l->t('Optional; one attribute per line'));?>" data-default="<?php p($_['ldap_attributes_for_group_search_default']); ?>" title="<?php p($l->t('Group Search Attributes'));?>"></textarea></p> <p><label for="ldap_group_member_assoc_attribute"><?php p($l->t('Group-Member association'));?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute" data-default="<?php p($_['ldap_group_member_assoc_attribute_default']); ?>" ><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'uniqueMember')) p(' selected'); ?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'memberUid')) p(' selected'); ?>>memberUid</option><option value="member"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'member')) p(' selected'); ?>>member (AD)</option></select></p> @@ -99,16 +99,16 @@ </fieldset> <fieldset id="ldapSettings-3"> <p><strong><?php p($l->t('Internal Username'));?></strong></p> - <p class="ldapIndent"><?php p($l->t('By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users.'));?></p> + <p class="ldapIndent"><?php p($l->t('By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users.'));?></p> <p class="ldapIndent"><label for="ldap_expert_username_attr"><?php p($l->t('Internal Username Attribute:'));?></label><input type="text" id="ldap_expert_username_attr" name="ldap_expert_username_attr" data-default="<?php p($_['ldap_expert_username_attr_default']); ?>" /></p> <p><strong><?php p($l->t('Override UUID detection'));?></strong></p> - <p class="ldapIndent"><?php p($l->t('By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups.'));?></p> + <p class="ldapIndent"><?php p($l->t('By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups.'));?></p> <p class="ldapIndent"><label for="ldap_expert_uuid_attr"><?php p($l->t('UUID Attribute:'));?></label><input type="text" id="ldap_expert_uuid_attr" name="ldap_expert_uuid_attr" data-default="<?php p($_['ldap_expert_uuid_attr_default']); ?>" /></p> <p><strong><?php p($l->t('Username-LDAP User Mapping'));?></strong></p> - <p class="ldapIndent"><?php p($l->t('ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage.'));?></p> + <p class="ldapIndent"><?php p($l->t('Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage.'));?></p> <p class="ldapIndent"><button id="ldap_action_clear_user_mappings" name="ldap_action_clear_user_mappings"><?php p($l->t('Clear Username-LDAP User Mapping'));?></button><br/><button id="ldap_action_clear_group_mappings" name="ldap_action_clear_group_mappings"><?php p($l->t('Clear Groupname-LDAP Group Mapping'));?></button></p> </fieldset> - <input id="ldap_submit" type="submit" value="Save" /> <button id="ldap_action_test_connection" name="ldap_action_test_connection"><?php p($l->t('Test Configuration'));?></button> <a href="http://doc.owncloud.org/server/5.0/admin_manual/auth_ldap.html" target="_blank"><img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>" style="height:1.75ex" /> <?php p($l->t('Help'));?></a> + <input id="ldap_submit" type="submit" value="Save" /> <button id="ldap_action_test_connection" name="ldap_action_test_connection"><?php p($l->t('Test Configuration'));?></button> <a href="<?php p($theme->getDocBaseUrl()); ?>/server/5.0/admin_manual/auth_ldap.html" target="_blank"><img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>" style="height:1.75ex" /> <?php p($l->t('Help'));?></a> </div> </form> diff --git a/apps/user_webdavauth/templates/settings.php b/apps/user_webdavauth/templates/settings.php index e199c32675c..70c10057c20 100755 --- a/apps/user_webdavauth/templates/settings.php +++ b/apps/user_webdavauth/templates/settings.php @@ -1,9 +1,9 @@ <form id="webdavauth" action="#" method="post"> <fieldset class="personalblock"> <legend><strong><?php p($l->t('WebDAV Authentication'));?></strong></legend> - <p><label for="webdav_url"><?php p($l->t('URL: '));?><input type="url" placeholder="https://example.com/webdav" id="webdav_url" name="webdav_url" value="<?php p($_['webdav_url']); ?>"></label> + <p><label for="webdav_url"><?php p($l->t('Address: '));?><input type="url" placeholder="https://example.com/webdav" id="webdav_url" name="webdav_url" value="<?php p($_['webdav_url']); ?>"></label> <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" id="requesttoken"> <input type="submit" value="Save" /> - <br /><?php p($l->t('ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials.')); ?> + <br /><?php p($l->t('The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials.')); ?> </fieldset> </form> diff --git a/core/css/styles.css b/core/css/styles.css index 7d927da151c..a4c84fa07a2 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -3,7 +3,7 @@ See the COPYING-README file. */ html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section { margin:0; padding:0; border:0; outline:0; font-weight:inherit; font-size:100%; font-family:inherit; vertical-align:baseline; cursor:default; } -html, body { height:100%; overflow:auto; } +html, body { height:100%; } article, aside, dialog, figure, footer, header, hgroup, nav, section { display:block; } body { line-height:1.5; } table { border-collapse:separate; border-spacing:0; white-space:nowrap; } @@ -20,16 +20,18 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari position:fixed; top:0; left:0; right:0; z-index:100; height:45px; line-height:2.5em; background:#1d2d44 url('../img/noise.png') repeat; -moz-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; } -#body-login #header { margin: -2em auto 0; text-align:center; height:10em; padding:1em 0 .5em; - -moz-box-shadow:0 0 1em rgba(0, 0, 0, .5); -webkit-box-shadow:0 0 1em rgba(0, 0, 0, .5); box-shadow:0 0 1em rgba(0, 0, 0, .5); -background:#1d2d44; /* Old browsers */ -background:-moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */ -background:-webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */ -background:-webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */ -background:-o-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Opera11.10+ */ -background:-ms-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* IE10+ */ -background:linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */ -filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */ } + +#body-login { + text-align: center; + background: #1d2d44; /* Old browsers */ + background: url('../img/noise.png'), -moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */ + background: url('../img/noise.png'), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */ + background: url('../img/noise.png'), -webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */ + background: url('../img/noise.png'), -o-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Opera11.10+ */ + background: url('../img/noise.png'), -ms-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* IE10+ */ + background: url('../img/noise.png'), linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */ +} #owncloud { position:absolute; top:0; left:0; padding:6px; padding-bottom:0; } .header-right { float:right; vertical-align:middle; padding:0.5em; } @@ -109,27 +111,35 @@ a.disabled, a.disabled:hover, a.disabled:focus { /* Primary action button, use sparingly */ .primary, input[type="submit"].primary, input[type="button"].primary, button.primary, .button.primary { - border:1px solid #1d2d44; - background:#35537a; color:#ddd; text-shadow:#000 0 -1px 0; - -moz-box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset; -webkit-box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset; box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset; + border: 1px solid #1d2d44; + background: #35537a; + color: #ddd; + text-shadow: #000 0 -1px 0; + -moz-box-shadow: 0 0 1px #000, 0 1px 0 #6d7d94 inset; + -webkit-box-shadow: 0 0 1px #000, 0 1px 0 #6d7d94 inset; + box-shadow: 0 0 1px #000, 0 1px 0 #6d7d94 inset; } .primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover, .primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus { - border:1px solid #1d2d44; - background:#2d3d54; color:#fff; text-shadow:#000 0 -1px 0; - -moz-box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset; -webkit-box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset; box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset; + border: 1px solid #1d2d44; + background: #304d76; + color: #fff; + text-shadow: #000 0 -1px 0; + -moz-box-shadow: 0 0 1px #000, 0 1px 0 #4d5d74 inset; + -webkit-box-shadow: 0 0 1px #000, 0 1px 0 #4d5d74 inset; + box-shadow: 0 0 1px #000, 0 1px 0 #4d5d74 inset; } .primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active { - border:1px solid #1d2d44; - background:#1d2d44; color:#bbb; text-shadow:#000 0 -1px 0; - -moz-box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; -webkit-box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; + border: 1px solid #1d2d44; + background: #1d2d44; + color: #bbb; + text-shadow: #000 0 -1px 0; + -moz-box-shadow: 0 1px 1px #3d4d64, 0 1px 1px 0 rgba(0,0,0,.2) inset; + -webkit-box-shadow: 0 1px 1px #3d4d64, 0 1px 1px 0 rgba(0,0,0,.2) inset; + box-shadow: 0 1px 1px #3d4d64, 0 1px 1px 0 rgba(0,0,0,.2) inset; } -#body-login input { font-size:1.5em; } -#body-login input[type="text"], #body-login input[type="password"] { width:13em; } -#body-login input.login { width:auto; float:right; padding:7px 9px 6px; } -#remember_login { margin:.8em .2em 0 1em; vertical-align:text-bottom; } .searchbox input[type="search"] { font-size:1.2em; padding:.2em .5em .2em 1.5em; background:#fff url('../img/actions/search.svg') no-repeat .5em center; border:0; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70);opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; margin-top:10px; float:right; } input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; } #select_all{ margin-top:.4em !important;} @@ -164,24 +174,67 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b #rightcontent, .rightcontent { position:fixed; top:6.4em; left:24.5em; overflow:auto } + + /* LOG IN & INSTALLATION ------------------------------------------------------------ */ -#body-login { background:#ddd; } + +/* Some whitespace to the top */ +#body-login #header { + padding-top: 100px; +} +/* Fix background gradient */ +#body-login { + background-attachment: fixed; +} + +/* Dark subtle label text */ +#body-login p.info, +#body-login form fieldset legend, +#body-login #datadirContent label, +#body-login form input[type="checkbox"]+label { + text-align: center; + color: #000; + text-shadow: 0 1px 0 rgba(255,255,255,.1); + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; + filter: alpha(opacity=80); + opacity: .8; +} + #body-login div.buttons { text-align:center; } -#body-login p.info { width:22em; text-align:center; margin:2em auto; color:#777; text-shadow:#fff 0 1px 0; } -#body-login p.info a { font-weight:bold; color:#777; } +#body-login p.info { + width: 22em; + margin: 0 auto; + padding-top: 20px; +} +#body-login p.info a { + font-weight: bold; +} #body-login #submit.login { margin-right:7px; } /* quick fix for log in button not being aligned with input fields, should be properly fixed by input field width later */ -#login { min-height:30em; margin:2em auto 0; border-bottom:1px solid #f8f8f8; background:#eee; } -#login form { width:22em; margin:2em auto 2em; padding:0; } -#login form fieldset { margin-bottom:20px; } -#login form #adminaccount { margin-bottom:5px; } -#login form fieldset legend, #datadirContent label { - width:100%; text-align:center; - font-weight:bold; color:#999; text-shadow:0 1px 0 white; +#body-login form { width:22em; margin:2em auto 2em; padding:0; } +#body-login form fieldset { + margin-bottom: 20px; + text-align: left; +} +#body-login form #adminaccount { margin-bottom:5px; } +#body-login form fieldset legend, #datadirContent label { + width: 100%; + font-weight: bold; +} +#body-login #datadirContent label { + display: block; + margin: 0; +} +#body-login form #datadirField legend { + margin-bottom: 15px; +} +#body-login #showAdvanced { + padding: 13px; /* increase clickable area of Advanced dropdown */ +} +#body-login #showAdvanced img { + vertical-align: bottom; /* adjust position of Advanced dropdown arrow */ + margin-left: -4px; } -#login form fieldset legend a { color:#999; } -#login #datadirContent label { display:block; margin:0; color:#999; } -#login form #datadirField legend { margin-bottom:15px; } /* Icons for username and password fields to better recognize them */ #adminlogin, #adminpass, #user, #password { width:11.7em!important; padding-left:1.8em; } @@ -193,84 +246,194 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b input[name="password-clone"] { padding-left:1.8em; width:11.7em !important; } input[name="adminpass-clone"] { padding-left:1.8em; width:11.7em !important; } -/* Nicely grouping input field sets */ -.grouptop input { - margin-bottom:0; - border-bottom:0; border-bottom-left-radius:0; border-bottom-right-radius:0; +/* General new input field look */ +#body-login input[type="text"], +#body-login input[type="password"], +#body-login input[type="email"] { + border: 1px solid #323233; + -moz-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset; + -webkit-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset; + box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset; } -.groupmiddle input { - margin-top:0; margin-bottom:0; - border-top:0; border-bottom:0; border-radius:0; - box-shadow:0 1px 1px #fff,0 1px 0 #ddd inset; + +/* Nicely grouping input field sets */ +#body-login .grouptop input { + margin-bottom: 0; + border-bottom: 0; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; +} +#body-login .groupmiddle input { + margin-top: 0; + margin-bottom: 0; + border-top: 0; + border-bottom: 0; + border-radius: 0; + -moz-box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important; + -webkit-box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important; + box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important; } -.groupbottom input { - margin-top:0; - border-top:0; border-top-right-radius:0; border-top-left-radius:0; - box-shadow:0 1px 1px #fff,0 1px 0 #ddd inset; +#body-login .groupbottom input { + margin-top: 0; + border-top: 0; + border-top-right-radius: 0; + border-top-left-radius: 0; + -moz-box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important; + -webkit-box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important; + box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important; } /* In field labels. No, HTML placeholder does not work as well. */ -#login form label { color:#666; } -#login .groupmiddle label, #login .groupbottom label { top:.65em; } +#body-login .groupmiddle label, #body-login .groupbottom label { top:.65em; } p.infield { position:relative; } label.infield { cursor:text !important; top:1.05em; left:.85em; } -#login form label.infield { /* labels are ellipsized when too long, keep them short */ +#body-login form label.infield { /* labels are ellipsized when too long, keep them short */ position:absolute; width:90%; padding-left:1.4em; font-size:19px; color:#aaa; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; } -#login #databaseField .infield { padding-left:0; } -#login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; } -#login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; } -#login .success { background:#d7fed7; border:1px solid #0f0; width: 35%; margin: 30px auto; padding:1em; text-align: center;} +#body-login #databaseField .infield { padding-left:0; } +#body-login form input[type="checkbox"]+label { + position: relative; + margin: 0; + font-size: 1em; + padding: 14px; + padding-left: 28px; + margin-left: -28px; +} +#body-login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; } +#body-login .success { background:#d7fed7; border:1px solid #0f0; width: 35%; margin: 30px auto; padding:1em; text-align: center;} /* Show password toggle */ -#show, #dbpassword { position:absolute; right:1em; top:.8em; float:right; } -#show, #dbpassword, #personal-show { display:none; } -#show + label, #dbpassword + label { right:1em; top:1.25em!important; } -#show:checked + label, #dbpassword:checked + label, #personal-show:checked + label { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; } +#show, #dbpassword { + position: absolute; + right: 1em; + top: .8em; + float: right; +} +#show, #dbpassword, #personal-show { + display: none; +} +#show + label, #dbpassword + label { + right: 21px; + top: 15px !important; + margin: -14px !important; + padding: 14px !important; +} +#show:checked + label, #dbpassword:checked + label, #personal-show:checked + label { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; + filter: alpha(opacity=80); + opacity: .8; +} #show + label, #dbpassword + label, #personal-show + label { - position:absolute!important; height:14px; width:24px; - background-image:url("../img/actions/toggle.png"); background-repeat:no-repeat; - -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3; + position: absolute !important; + height: 14px; + width: 24px; + background-image: url("../img/actions/toggle.png"); + background-repeat: no-repeat; + background-position: center; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; + filter: alpha(opacity=30); + opacity: .3; +} +#pass2, input[name="personal-password-clone"] { + padding: .6em 2.5em .4em .4em; + width: 8em; +} +#personal-show + label { + margin-top: 1em; + margin-left: -3em; +} +#passwordbutton { + margin-left: .5em; } -#pass2, input[name="personal-password-clone"] { padding:0.6em 2.5em 0.4em 0.4em; width:8em;} -#personal-show + label { margin-top:1em; margin-left:-3em; } -#passwordbutton { margin-left:0.5em; } /* Database selector */ -#login form #selectDbType { text-align:center; } -#login form #selectDbType label { +#body-login form #selectDbType { text-align:center; white-space: nowrap; } +#body-login form #selectDbType label { position:static; margin:0 -3px 5px; padding:.4em; font-size:12px; font-weight:bold; background:#f8f8f8; color:#888; cursor:pointer; border:1px solid #ddd; text-shadow:#eee 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; } -#login form #selectDbType label.ui-state-hover, #login form #selectDbType label.ui-state-active { color:#000; background-color:#e8e8e8; } +#body-login form #selectDbType label.ui-state-hover, #body-login form #selectDbType label.ui-state-active { color:#000; background-color:#e8e8e8; } + -/* Warnings, for information */ -.warning { +/* Warnings and errors are the same */ +.warning, .update, .error { display: block; - background-color: #f2dede; - color: #b94a48; - padding: 8px; - margin: 0 7px 5px; - border: 1px solid #eed3d7; + padding: 10px; + color: #dd3b3b; + text-shadow: 0 -1px 0 rgba(0,0,0,.3); + background-color: rgba(0,0,0,.3); + text-align: center; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; border-radius: 5px; + cursor: default; } .warning legend, -.warning a { - color: #b94a48 !important; +.warning a, +.error a { + color: #dd3b3b !important; + font-weight: bold; +} +/* Fixes for log in page, TODO should be removed some time */ +#body-login .update, +#body-login .error { + margin: 35px auto; +} +#body-login .warning { + margin: 0 7px 5px; font-weight: bold; } -/* Errors, for grave states */ -li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; cursor:default; } -.error { color:#FF3B3B; } +#body-login .warning legend { + text-shadow: none; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; + filter: alpha(opacity=100); + opacity: 1; +} +#body-login a.warning { + cursor: pointer; +} + /* Alternative Logins */ #alternative-logins legend { margin-bottom:10px; } #alternative-logins li { height:40px; display:inline-block; white-space:nowrap; } +/* Log in and install button */ +#body-login input { + font-size: 1.5em; +} +#body-login input[type="text"], +#body-login input[type="password"] { + width: 13em; +} +#body-login input.login { + width: auto; + float: right; +} +#body-login input[type="submit"] { + padding: 10px 20px; /* larger log in and installation buttons */ +} +#remember_login { + margin: 18px 5px 0 18px; + vertical-align: text-bottom; +} + +/* Sticky footer */ +#body-login .wrapper { + min-height: 100%; + margin: 0 auto -70px; + width: 300px; +} +#body-login footer, #body-login .push { + height: 70px; +} + + + /* NAVIGATION ------------------------------------------------------------- */ #navigation { @@ -383,7 +546,6 @@ div.jp-play-bar, div.jp-seek-bar { padding:0; } .pager li { display:inline-block; } .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { overflow:hidden; text-overflow:ellipsis; } -.hint { background-image:url('../img/actions/info.png'); background-repeat:no-repeat; color:#777; padding-left:25px; background-position:0 0.3em;} .separator { display:inline; border-left:1px solid #d3d3d3; border-right:1px solid #fff; height:10px; width:0px; margin:4px; } a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;padding-top:0px;padding-bottom:2px; text-decoration:none; margin-top:5px } @@ -677,8 +839,9 @@ button.loading { /* ---- BROWSER-SPECIFIC FIXES ---- */ +/* remove dotted outlines in Firefox */ ::-moz-focus-inner { - border: 0; /* remove dotted outlines in Firefox */ + border: 0; } /* deactivate show password toggle for IE. Does not work for 8 and 9+ have their own implementation. */ @@ -686,3 +849,8 @@ button.loading { display: none; visibility: hidden; } + +/* fix installation screen rendering issue for IE8+9 */ +.lte9 #body-login { + height: auto !important; +} diff --git a/core/img/actions/caret-dark.png b/core/img/actions/caret-dark.png Binary files differindex 8ac5fbbd198..f84e87e0a82 100644 --- a/core/img/actions/caret-dark.png +++ b/core/img/actions/caret-dark.png diff --git a/core/img/actions/caret-dark.svg b/core/img/actions/caret-dark.svg index be45ad402bf..3a5318e6fa2 100644 --- a/core/img/actions/caret-dark.svg +++ b/core/img/actions/caret-dark.svg @@ -1,5 +1,13 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="10" width="10" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 2 4 8 4-7.989z" fill="#fff"/> - <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 1 4 8 4-7.989z" fill="#999"/> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;" d="m4,5,4,7,4-6.989z" fill-opacity="0.19607843" fill="#FFF"/> + <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;" fill="#000" d="m4,4,4,7,4-6.989z"/> </svg> diff --git a/core/js/setup.js b/core/js/setup.js index 76812b29979..c0df1ed96b0 100644 --- a/core/js/setup.js +++ b/core/js/setup.js @@ -11,42 +11,36 @@ $(document).ready(function() { $('#selectDbType').buttonset(); $('#datadirContent').hide(250); $('#databaseField').hide(250); - if($('#hasSQLite').val()=='true'){ + if($('#hasSQLite').val()){ $('#use_other_db').hide(); - $('#dbhost').hide(); - $('#dbhostlabel').hide(); + $('#use_oracle_db').hide(); } $('#adminlogin').change(function(){ $('#adminlogin').val($.trim($('#adminlogin').val())); }); $('#sqlite').click(function() { $('#use_other_db').slideUp(250); - $('#dbhost').hide(250); - $('#dbhostlabel').hide(250); + $('#use_oracle_db').slideUp(250); }); $('#mysql').click(function() { $('#use_other_db').slideDown(250); - $('#dbhost').show(250); - $('#dbhostlabel').show(250); + $('#use_oracle_db').slideUp(250); }); - + $('#pgsql').click(function() { $('#use_other_db').slideDown(250); - $('#dbhost').show(250); - $('#dbhostlabel').show(250); + $('#use_oracle_db').slideUp(250); }); - + $('#oci').click(function() { $('#use_other_db').slideDown(250); - $('#dbhost').show(250); - $('#dbhostlabel').show(250); + $('#use_oracle_db').show(250); }); - + $('#mssql').click(function() { $('#use_other_db').slideDown(250); - $('#dbhost').show(250); - $('#dbhostlabel').show(250); + $('#use_oracle_db').slideUp(250); }); $('input[checked]').trigger('click'); diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php index dfe0cbaeb81..6780a69a22f 100644 --- a/core/l10n/nb_NO.php +++ b/core/l10n/nb_NO.php @@ -1,5 +1,7 @@ <?php $TRANSLATIONS = array( +"%s shared »%s« with you" => "%s delte »%s« med deg", "No category to add?" => "Ingen kategorier å legge til?", +"This category already exists: %s" => "Denne kategorien finnes allerede: %s", "No categories selected for deletion." => "Ingen kategorier merket for sletting.", "Sunday" => "Søndag", "Monday" => "Mandag", @@ -40,8 +42,10 @@ "No" => "Nei", "Ok" => "Ok", "Error" => "Feil", +"Shared" => "Delt", "Share" => "Del", "Error while sharing" => "Feil under deling", +"Shared with you by {owner}" => "Delt med deg av {owner}", "Share with" => "Del med", "Share with link" => "Del med link", "Password protect" => "Passordbeskyttet", @@ -78,6 +82,7 @@ "Help" => "Hjelp", "Access forbidden" => "Tilgang nektet", "Cloud not found" => "Sky ikke funnet", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hei der.⏎\n⏎\nVille bare gjøre deg oppmerksom på at %s delte %s med deg.⏎\nVis den: %s⏎\n⏎\nVI ses!", "Edit categories" => "Rediger kategorier", "Add" => "Legg til", "Security Warning" => "Sikkerhetsadvarsel", @@ -100,5 +105,6 @@ "remember" => "husk", "Log in" => "Logg inn", "prev" => "forrige", -"next" => "neste" +"next" => "neste", +"Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til versjon %s, dette kan ta en stund." ); diff --git a/core/templates/altmail.php b/core/templates/altmail.php index a7df29a2446..2551473c6f0 100644 --- a/core/templates/altmail.php +++ b/core/templates/altmail.php @@ -1,9 +1,7 @@ <?php -$defaults = new OC_Defaults(); - print_unescaped($l->t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!", array($_['user_displayname'], $_['filename'], $_['link']))); ?> -- -<?php p($defaults->getName() . ' - ' . $defaults->getSlogan()); ?> -<?php print_unescaped("\n".$defaults->getBaseUrl()); +<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?> +<?php print_unescaped("\n".$theme->getBaseUrl()); diff --git a/core/templates/installation.php b/core/templates/installation.php index 7f2796a4b31..77c455304d3 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -23,7 +23,7 @@ <fieldset class="warning"> <legend><strong><?php p($l->t('Security Warning'));?></strong></legend> <p><?php p($l->t('Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)'));?><br/> - <?php p($l->t('Please update your PHP installation to use ownCloud securely.'));?></p> + <?php p($l->t('Please update your PHP installation to use %s securely.', $theme->getName() )); ?></p> </fieldset> <?php endif; ?> <?php if(!$_['secureRNG']): ?> @@ -37,7 +37,10 @@ <fieldset class="warning"> <legend><strong><?php p($l->t('Security Warning'));?></strong></legend> <p><?php p($l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.'));?><br> - <?php print_unescaped($l->t('For information how to properly configure your server, please see the <a href="http://doc.owncloud.org/server/5.0/admin_manual/installation.html" target="_blank">documentation</a>.'));?></p> + <?php print_unescaped($l->t( + 'For information how to properly configure your server, please see the <a href="%s" target="_blank">documentation</a>.', + $theme->getDocBaseUrl().'/server/5.0/admin_manual/installation.html' + )); ?></p> </fieldset> <?php endif; ?> <fieldset id="adminaccount"> @@ -118,7 +121,7 @@ <?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/> <?php endif; ?> <?php endif; ?> - + <?php if($_['hasMSSQL']): ?> <input type='hidden' id='hasMSSQL' value='true'/> <?php if(!$_['hasSQLite'] and !$_['hasMySQL'] and !$_['hasPostgreSQL'] and !$_['hasOracle']): ?> @@ -128,7 +131,7 @@ <label class="mssql" for="mssql">MS SQL</label> <input type="radio" name="dbtype" value='mssql' id="mssql" <?php OC_Helper::init_radio('dbtype', 'mssql', 'sqlite'); ?>/> <?php endif; ?> - <?php endif; ?> + <?php endif; ?> </div> <?php if($hasOtherDB): ?> @@ -151,22 +154,22 @@ value="<?php p(OC_Helper::init_var('dbname')); ?>" autocomplete="off" pattern="[0-9a-zA-Z$_-]+" /> </p> - </div> - <?php endif; ?> - <?php if($_['hasOracle']): ?> - <div id="use_oracle_db"> - <p class="infield groupmiddle"> - <label for="dbtablespace" class="infield"><?php p($l->t( 'Database tablespace' )); ?></label> - <input type="text" name="dbtablespace" id="dbtablespace" placeholder="" - value="<?php p(OC_Helper::init_var('dbtablespace')); ?>" autocomplete="off" /> + <?php if($_['hasOracle']): ?> + <div id="use_oracle_db"> + <p class="infield groupmiddle"> + <label for="dbtablespace" class="infield"><?php p($l->t( 'Database tablespace' )); ?></label> + <input type="text" name="dbtablespace" id="dbtablespace" placeholder="" + value="<?php p(OC_Helper::init_var('dbtablespace')); ?>" autocomplete="off" /> + </p> + </div> + <?php endif; ?> + <p class="infield groupbottom"> + <label for="dbhost" class="infield"><?php p($l->t( 'Database host' )); ?></label> + <input type="text" name="dbhost" id="dbhost" placeholder="" + value="<?php p(OC_Helper::init_var('dbhost')); ?>" /> </p> </div> <?php endif; ?> - <p class="infield groupbottom"> - <label for="dbhost" class="infield" id="dbhostlabel"><?php p($l->t( 'Database host' )); ?></label> - <input type="text" name="dbhost" id="dbhost" placeholder="" - value="<?php p(OC_Helper::init_var('dbhost')); ?>" /> - </p> </fieldset> <div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" /></div> diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 09e1006d507..ea10c3042b5 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -6,11 +6,9 @@ <!--[if gt IE 9]><html class="ng-csp ie"><![endif]--> <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]--> - <?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?> - <head> <title> - <?php p($defaults->getName()); ?> + <?php p($theme->getTitle()); ?> </title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" /> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 329744e3824..9c9eb63382f 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -6,11 +6,9 @@ <!--[if gt IE 9]><html class="ng-csp ie"><![endif]--> <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]--> - <?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?> - <head data-requesttoken="<?php p($_['requesttoken']); ?>"> <title> - <?php p($defaults->getName()); ?> + <?php p($theme->getTitle()); ?> </title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="apple-itunes-app" content="app-id=543672169"> @@ -22,7 +20,7 @@ <?php foreach($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php print_unescaped($jsfile); ?>"></script> <?php endforeach; ?> - + <?php foreach($_['headers'] as $header): ?> <?php print_unescaped('<'.$header['tag'].' '); @@ -35,16 +33,21 @@ </head> <body id="body-login"> - <div id="login"> + <div class="wrapper"><!-- for sticky footer --> <header><div id="header"> - <img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="ownCloud" /> - <div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div> + <img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="<?php p($theme->getName()); ?>" /> + <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> </div></header> + <?php print_unescaped($_['content']); ?> + + <div class="push"></div><!-- for sticky footer --> </div> + <footer> <p class="info"> - <?php print_unescaped($defaults->getLongFooter()); ?> - </p></footer> + <?php print_unescaped($theme->getLongFooter()); ?> + </p> + </footer> </body> </html> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index dacbe79bd34..b7405ea273b 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -6,12 +6,10 @@ <!--[if gt IE 9]><html class="ng-csp ie"><![endif]--> <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]--> - <?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?> - <head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>"> <title> <?php p(!empty($_['application'])?$_['application'].' | ':''); - p($defaults->getName()); + p($theme->getTitle()); p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?> </title> <meta charset="utf-8"> @@ -45,8 +43,8 @@ </div> <header><div id="header"> <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg" - src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="ownCloud" /></a> - <div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div> + src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a> + <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> <ul id="settings" class="svg"> <span id="expand" tabindex="0" role="link"> <span id="expandDisplayName"><?php p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span> diff --git a/core/templates/login.php b/core/templates/login.php index 571e0a865d9..9143510f757 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -35,8 +35,8 @@ </a> <?php endif; ?> - <input type="checkbox" name="remember_login" value="1" id="remember_login"/><label - for="remember_login"><?php p($l->t('remember')); ?></label> + <input type="checkbox" name="remember_login" value="1" id="remember_login" checked /> + <label for="remember_login"><?php p($l->t('remember')); ?></label> <input type="hidden" name="timezone-offset" id="timezone-offset"/> <input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>"/> </fieldset> diff --git a/core/templates/mail.php b/core/templates/mail.php index 562ad82e953..de72b136b13 100644 --- a/core/templates/mail.php +++ b/core/templates/mail.php @@ -1,11 +1,10 @@ -<?php $defaults = new OC_Defaults() // initialize themable default strings and urls ?> <table cellspacing="0" cellpadding="0" border="0" width="100%"> <tr><td> <table cellspacing="0" cellpadding="0" border="0" width="600px"> <tr> <td bgcolor="#1d2d44" width="20px"> </td> <td bgcolor="#1d2d44"> -<img src="<?php print_unescaped(OC_Helper::makeURLAbsolute(image_path('', 'logo-mail.gif'))); ?>" alt="ownCloud"/> +<img src="<?php print_unescaped(OC_Helper::makeURLAbsolute(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/> </td> </tr> <tr><td bgcolor="#f8f8f8" colspan="2"> </td></tr> @@ -21,9 +20,9 @@ print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared » <tr> <td bgcolor="#f8f8f8" width="20px"> </td> <td bgcolor="#f8f8f8" style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br> -<?php p($defaults->getName()); ?> - -<?php p($defaults->getSlogan()); ?> -<br><a href="<?php print_unescaped($defaults->getBaseUrl()); ?>"><?php print_unescaped($defaults->getBaseUrl());?></a></td> +<?php p($theme->getName()); ?> - +<?php p($theme->getSlogan()); ?> +<br><a href="<?php print_unescaped($theme->getBaseUrl()); ?>"><?php print_unescaped($theme->getBaseUrl());?></a></td> </tr> <tr> <td bgcolor="#f8f8f8" colspan="2"> </td> diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po index 10f36906028..e89d30f4081 100644 --- a/l10n/af_ZA/lib.po +++ b/l10n/af_ZA/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-22 06:02+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "Toepassings" msgid "Admin" msgstr "Admin" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "webdienste onder jou beheer" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "" @@ -53,15 +63,21 @@ msgstr "" msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -189,58 +205,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po index 4fdf77792c6..e1901ce0fef 100644 --- a/l10n/ar/lib.po +++ b/l10n/ar/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "التطبيقات" msgid "Admin" msgstr "المدير" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "خدمات الشبكة تحت سيطرتك" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "تحميل ملفات ZIP متوقف" @@ -53,15 +63,21 @@ msgstr "تحميل ملفات ZIP متوقف" msgid "Files need to be downloaded one by one." msgstr "الملفات بحاجة الى ان يتم تحميلها واحد تلو الاخر" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "العودة الى الملفات" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "الملفات المحددة كبيرة جدا ليتم ضغطها في ملف zip" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "تعذّر تحديده" @@ -189,58 +205,62 @@ msgstr "اعدادات خادمك غير صحيحة بشكل تسمح لك بم msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "منذ ثواني" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "منذ دقيقة" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d دقيقة مضت" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "قبل ساعة مضت" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d ساعة مضت" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "اليوم" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "يوم أمس" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d يوم مضى" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "الشهر الماضي" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d شهر مضت" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "السنةالماضية" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "سنة مضت" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/be/lib.po b/l10n/be/lib.po index 4d50e77416a..56bb86b0ac2 100644 --- a/l10n/be/lib.po +++ b/l10n/be/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-05 02:13+0200\n" -"PO-Revision-Date: 2013-07-05 00:13+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n" "MIME-Version: 1.0\n" @@ -41,27 +41,43 @@ msgstr "" msgid "Admin" msgstr "" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "" -#: files.php:210 +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + +#: files.php:226 msgid "ZIP download is turned off." msgstr "" -#: files.php:211 +#: files.php:227 msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:212 files.php:245 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:242 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -170,77 +186,81 @@ msgstr "" msgid "PostgreSQL username and/or password not valid" msgstr "" -#: setup.php:42 +#: setup.php:28 msgid "Set an admin username." msgstr "" -#: setup.php:45 +#: setup.php:31 msgid "Set an admin password." msgstr "" -#: setup.php:198 +#: setup.php:184 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." msgstr "" -#: setup.php:199 +#: setup.php:185 #, php-format msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:113 +#: template/functions.php:80 msgid "seconds ago" msgstr "" -#: template.php:114 +#: template/functions.php:81 msgid "1 minute ago" msgstr "" -#: template.php:115 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:116 +#: template/functions.php:83 msgid "1 hour ago" msgstr "" -#: template.php:117 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:118 +#: template/functions.php:85 msgid "today" msgstr "" -#: template.php:119 +#: template/functions.php:86 msgid "yesterday" msgstr "" -#: template.php:120 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:121 +#: template/functions.php:88 msgid "last month" msgstr "" -#: template.php:122 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:123 +#: template/functions.php:90 msgid "last year" msgstr "" -#: template.php:124 +#: template/functions.php:91 msgid "years ago" msgstr "" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po index bd663bdd1ee..74cc7751a41 100644 --- a/l10n/bg_BG/lib.po +++ b/l10n/bg_BG/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Приложения" msgid "Admin" msgstr "Админ" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "уеб услуги под Ваш контрол" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Изтеглянето като ZIP е изключено." @@ -54,15 +64,21 @@ msgstr "Изтеглянето като ZIP е изключено." msgid "Files need to be downloaded one by one." msgstr "Файловете трябва да се изтеглят един по един." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Назад към файловете" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Избраните файлове са прекалено големи за генерирането на ZIP архив." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "не може да се определи" @@ -190,58 +206,62 @@ msgstr "Вашият web сървър все още не е удачно нас msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "преди секунди" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "преди 1 минута" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "преди %d минути" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "преди 1 час" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "преди %d часа" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "днес" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "вчера" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "преди %d дни" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "последният месец" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "преди %d месеца" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "последната година" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "последните години" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po index ed1031c84c9..d9e572a75f8 100644 --- a/l10n/bn_BD/lib.po +++ b/l10n/bn_BD/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "অ্যাপ" msgid "Admin" msgstr "প্রশাসন" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "ওয়েব সার্ভিস আপনার হাতের মুঠোয়" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "ZIP ডাউনলোড বন্ধ করা আছে।" @@ -53,15 +63,21 @@ msgstr "ZIP ডাউনলোড বন্ধ করা আছে।" msgid "Files need to be downloaded one by one." msgstr "ফাইলগুলো একে একে ডাউনলোড করা আবশ্যক।" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "ফাইলে ফিরে চল" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "নির্বাচিত ফাইলগুলো এতই বৃহৎ যে জিপ ফাইল তৈরী করা সম্ভব নয়।" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -189,58 +205,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "সেকেন্ড পূর্বে" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "১ মিনিট পূর্বে" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d মিনিট পূর্বে" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 ঘন্টা পূর্বে" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "আজ" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "গতকাল" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d দিন পূর্বে" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "গত মাস" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "গত বছর" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "বছর পূর্বে" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/bs/lib.po b/l10n/bs/lib.po index 815a68397d7..4def658658b 100644 --- a/l10n/bs/lib.po +++ b/l10n/bs/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-05 02:13+0200\n" -"PO-Revision-Date: 2013-07-05 00:13+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n" "MIME-Version: 1.0\n" @@ -41,27 +41,43 @@ msgstr "" msgid "Admin" msgstr "" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "" -#: files.php:210 +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + +#: files.php:226 msgid "ZIP download is turned off." msgstr "" -#: files.php:211 +#: files.php:227 msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:212 files.php:245 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:242 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -170,77 +186,81 @@ msgstr "" msgid "PostgreSQL username and/or password not valid" msgstr "" -#: setup.php:42 +#: setup.php:28 msgid "Set an admin username." msgstr "" -#: setup.php:45 +#: setup.php:31 msgid "Set an admin password." msgstr "" -#: setup.php:198 +#: setup.php:184 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." msgstr "" -#: setup.php:199 +#: setup.php:185 #, php-format msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:113 +#: template/functions.php:80 msgid "seconds ago" msgstr "" -#: template.php:114 +#: template/functions.php:81 msgid "1 minute ago" msgstr "" -#: template.php:115 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:116 +#: template/functions.php:83 msgid "1 hour ago" msgstr "" -#: template.php:117 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:118 +#: template/functions.php:85 msgid "today" msgstr "" -#: template.php:119 +#: template/functions.php:86 msgid "yesterday" msgstr "" -#: template.php:120 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:121 +#: template/functions.php:88 msgid "last month" msgstr "" -#: template.php:122 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:123 +#: template/functions.php:90 msgid "last year" msgstr "" -#: template.php:124 +#: template/functions.php:91 msgid "years ago" msgstr "" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po index 7c86622a7ab..8f316d07dbe 100644 --- a/l10n/ca/lib.po +++ b/l10n/ca/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Aplicacions" msgid "Admin" msgstr "Administració" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "controleu els vostres serveis web" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "La baixada en ZIP està desactivada." @@ -54,15 +64,21 @@ msgstr "La baixada en ZIP està desactivada." msgid "Files need to be downloaded one by one." msgstr "Els fitxers s'han de baixar d'un en un." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Torna a Fitxers" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Els fitxers seleccionats son massa grans per generar un fitxer zip." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "no s'ha pogut determinar" @@ -190,58 +206,62 @@ msgstr "El servidor web no està configurat correctament per permetre la sincron msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Comproveu les <a href='%s'>guies d'instal·lació</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "segons enrere" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "fa 1 minut" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "fa %d minuts" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "fa 1 hora" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "fa %d hores" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "avui" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "ahir" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "fa %d dies" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "el mes passat" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "fa %d mesos" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "l'any passat" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "anys enrere" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po index 29c915f0274..d19bbe4bb92 100644 --- a/l10n/cs_CZ/lib.po +++ b/l10n/cs_CZ/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Aplikace" msgid "Admin" msgstr "Administrace" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "služby webu pod Vaší kontrolou" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Stahování ZIPu je vypnuto." @@ -54,15 +64,21 @@ msgstr "Stahování ZIPu je vypnuto." msgid "Files need to be downloaded one by one." msgstr "Soubory musí být stahovány jednotlivě." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Zpět k souborům" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Vybrané soubory jsou příliš velké pro vytvoření zip souboru." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "nelze zjistit" @@ -190,58 +206,62 @@ msgstr "Váš webový server není správně nastaven pro umožnění synchroniz msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "před pár vteřinami" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "před minutou" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "před %d minutami" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "před hodinou" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "před %d hodinami" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "dnes" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "včera" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "před %d dny" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "minulý měsíc" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "Před %d měsíci" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "minulý rok" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "před lety" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/cy_GB/lib.po b/l10n/cy_GB/lib.po index b8199d6217d..ce21b1417ac 100644 --- a/l10n/cy_GB/lib.po +++ b/l10n/cy_GB/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "Pecynnau" msgid "Admin" msgstr "Gweinyddu" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "gwasanaethau gwe a reolir gennych" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Mae llwytho ZIP wedi ei ddiffodd." @@ -53,15 +63,21 @@ msgstr "Mae llwytho ZIP wedi ei ddiffodd." msgid "Files need to be downloaded one by one." msgstr "Mae angen llwytho ffeiliau i lawr fesul un." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Nôl i Ffeiliau" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Mae'r ffeiliau ddewiswyd yn rhy fawr i gynhyrchu ffeil zip." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "methwyd pennu" @@ -189,58 +205,62 @@ msgstr "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau o msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "eiliad yn ôl" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 munud yn ôl" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d munud yn ôl" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 awr yn ôl" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d awr yn ôl" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "heddiw" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "ddoe" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d diwrnod yn ôl" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "mis diwethaf" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d mis yn ôl" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "y llynedd" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "blwyddyn yn ôl" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/da/lib.po b/l10n/da/lib.po index 7e95b63abd7..03a1bcfb42f 100644 --- a/l10n/da/lib.po +++ b/l10n/da/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Apps" msgid "Admin" msgstr "Admin" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "Webtjenester under din kontrol" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "ZIP-download er slået fra." @@ -54,15 +64,21 @@ msgstr "ZIP-download er slået fra." msgid "Files need to be downloaded one by one." msgstr "Filer skal downloades en for en." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Tilbage til Filer" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "De markerede filer er for store til at generere en ZIP-fil." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "kunne ikke fastslås" @@ -190,58 +206,62 @@ msgstr "Din webserver er endnu ikke sat op til at tillade fil synkronisering for msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "sekunder siden" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 minut siden" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d minutter siden" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 time siden" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d timer siden" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "i dag" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "i går" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d dage siden" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "sidste måned" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d måneder siden" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "sidste år" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "år siden" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/de/lib.po b/l10n/de/lib.po index 7c724bda5a8..9617f868401 100644 --- a/l10n/de/lib.po +++ b/l10n/de/lib.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: German <translations@owncloud.org>\n" "MIME-Version: 1.0\n" @@ -43,10 +43,20 @@ msgstr "Apps" msgid "Admin" msgstr "Administration" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "Web-Services unter Deiner Kontrolle" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Der ZIP-Download ist deaktiviert." @@ -55,15 +65,21 @@ msgstr "Der ZIP-Download ist deaktiviert." msgid "Files need to be downloaded one by one." msgstr "Die Dateien müssen einzeln heruntergeladen werden." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Zurück zu \"Dateien\"" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "konnte nicht festgestellt werden" @@ -191,58 +207,62 @@ msgstr "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil d msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "Gerade eben" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "vor einer Minute" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "Vor %d Minuten" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "Vor einer Stunde" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "Vor %d Stunden" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "Heute" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "Gestern" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "Vor %d Tag(en)" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "Letzten Monat" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "Vor %d Monaten" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "Letztes Jahr" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "Vor Jahren" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/de/settings.po b/l10n/de/settings.po index be9bdae7e3c..ec725c94768 100644 --- a/l10n/de/settings.po +++ b/l10n/de/settings.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:55+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-23 21:56+0000\n" +"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" "Language-Team: German <translations@owncloud.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -280,12 +280,12 @@ msgstr "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen" #: templates/admin.php:153 msgid "Allow public uploads" -msgstr "" +msgstr "Öffentliches Hochladen erlauben" #: templates/admin.php:154 msgid "" "Allow users to enable others to upload into their publicly shared folders" -msgstr "" +msgstr "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen" #: templates/admin.php:162 msgid "Allow resharing" diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po index 202f99c4301..2908fcd3ca3 100644 --- a/l10n/de_DE/lib.po +++ b/l10n/de_DE/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: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" -"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" +"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: German (Germany) <translations@owncloud.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,10 +42,20 @@ msgstr "Apps" msgid "Admin" msgstr "Administrator" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "Web-Services unter Ihrer Kontrolle" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Der ZIP-Download ist deaktiviert." @@ -54,15 +64,21 @@ msgstr "Der ZIP-Download ist deaktiviert." msgid "Files need to be downloaded one by one." msgstr "Die Dateien müssen einzeln heruntergeladen werden." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Zurück zu \"Dateien\"" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "konnte nicht ermittelt werden" @@ -190,58 +206,62 @@ msgstr "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfigurie msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "Gerade eben" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "Vor 1 Minute" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "Vor %d Minuten" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "Vor einer Stunde" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "Vor %d Stunden" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "Heute" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "Gestern" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "Vor %d Tag(en)" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "Letzten Monat" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "Vor %d Monaten" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "Letztes Jahr" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "Vor Jahren" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index 82698851688..c7c5d9647d7 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:55+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-23 21:56+0000\n" +"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" "Language-Team: German (Germany) <translations@owncloud.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -281,12 +281,12 @@ msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen" #: templates/admin.php:153 msgid "Allow public uploads" -msgstr "" +msgstr "Erlaube öffentliches hochladen" #: templates/admin.php:154 msgid "" "Allow users to enable others to upload into their publicly shared folders" -msgstr "" +msgstr "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen" #: templates/admin.php:162 msgid "Allow resharing" diff --git a/l10n/el/lib.po b/l10n/el/lib.po index 0bc015505de..47a64c55113 100644 --- a/l10n/el/lib.po +++ b/l10n/el/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Εφαρμογές" msgid "Admin" msgstr "Διαχειριστής" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "υπηρεσίες δικτύου υπό τον έλεγχό σας" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Η λήψη ZIP απενεργοποιήθηκε." @@ -54,15 +64,21 @@ msgstr "Η λήψη ZIP απενεργοποιήθηκε." msgid "Files need to be downloaded one by one." msgstr "Τα αρχεία πρέπει να ληφθούν ένα-ένα." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Πίσω στα Αρχεία" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Τα επιλεγμένα αρχεία είναι μεγάλα ώστε να δημιουργηθεί αρχείο zip." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "δεν μπορούσε να προσδιορισθεί" @@ -190,58 +206,62 @@ msgstr "Ο διακομιστής σας δεν έχει ρυθμιστεί κα msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "δευτερόλεπτα πριν" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 λεπτό πριν" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d λεπτά πριν" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 ώρα πριν" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d ώρες πριν" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "σήμερα" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "χτες" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d ημέρες πριν" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "τελευταίο μήνα" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d μήνες πριν" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "τελευταίο χρόνο" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "χρόνια πριν" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/el/settings.po b/l10n/el/settings.po index e8db1d9429e..5d394d36ded 100644 --- a/l10n/el/settings.po +++ b/l10n/el/settings.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Efstathios Iosifidis <iefstathios@gmail.com>, 2013 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2013 # KAT.RAT12 <spanish.katerina@gmail.com>, 2013 # Teogramm <theodorewii121@hotmail.com>, 2013 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:55+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-23 11:50+0000\n" +"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\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" @@ -470,7 +471,7 @@ msgstr "WebDAV" msgid "" "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" " "target=\"_blank\">access your Files via WebDAV</a>" -msgstr "" +msgstr "Χρήση αυτής της διεύθυνσης για <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">πρόσβαση των αρχείων σας μέσω WebDAV</a>" #: templates/users.php:21 msgid "Login Name" diff --git a/l10n/en@pirate/lib.po b/l10n/en@pirate/lib.po index c41a9363909..fb244e8b564 100644 --- a/l10n/en@pirate/lib.po +++ b/l10n/en@pirate/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-06 02:02+0200\n" -"PO-Revision-Date: 2013-07-05 00:30+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" @@ -41,27 +41,43 @@ msgstr "" msgid "Admin" msgstr "" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "web services under your control" -#: files.php:210 +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + +#: files.php:226 msgid "ZIP download is turned off." msgstr "" -#: files.php:211 +#: files.php:227 msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:212 files.php:245 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:242 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -170,77 +186,81 @@ msgstr "" msgid "PostgreSQL username and/or password not valid" msgstr "" -#: setup.php:42 +#: setup.php:28 msgid "Set an admin username." msgstr "" -#: setup.php:45 +#: setup.php:31 msgid "Set an admin password." msgstr "" -#: setup.php:198 +#: setup.php:184 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." msgstr "" -#: setup.php:199 +#: setup.php:185 #, php-format msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:113 +#: template/functions.php:80 msgid "seconds ago" msgstr "" -#: template.php:114 +#: template/functions.php:81 msgid "1 minute ago" msgstr "" -#: template.php:115 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:116 +#: template/functions.php:83 msgid "1 hour ago" msgstr "" -#: template.php:117 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:118 +#: template/functions.php:85 msgid "today" msgstr "" -#: template.php:119 +#: template/functions.php:86 msgid "yesterday" msgstr "" -#: template.php:120 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:121 +#: template/functions.php:88 msgid "last month" msgstr "" -#: template.php:122 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:123 +#: template/functions.php:90 msgid "last year" msgstr "" -#: template.php:124 +#: template/functions.php:91 msgid "years ago" msgstr "" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po index 34706a7f376..60028aadc88 100644 --- a/l10n/eo/lib.po +++ b/l10n/eo/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Aplikaĵoj" msgid "Admin" msgstr "Administranto" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "TTT-servoj regataj de vi" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "ZIP-elŝuto estas malkapabligita." @@ -54,15 +64,21 @@ msgstr "ZIP-elŝuto estas malkapabligita." msgid "Files need to be downloaded one by one." msgstr "Dosieroj devas elŝutiĝi unuope." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Reen al la dosieroj" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "La elektitaj dosieroj tro grandas por genero de ZIP-dosiero." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -190,58 +206,62 @@ msgstr "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dos msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "sekundoj antaŭe" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "antaŭ 1 minuto" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "antaŭ %d minutoj" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "antaŭ 1 horo" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "antaŭ %d horoj" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "hodiaŭ" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "hieraŭ" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "antaŭ %d tagoj" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "lastamonate" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "antaŭ %d monatoj" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "lastajare" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "jaroj antaŭe" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/es/lib.po b/l10n/es/lib.po index f18384938c0..4d7f653565d 100644 --- a/l10n/es/lib.po +++ b/l10n/es/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Aplicaciones" msgid "Admin" msgstr "Administración" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "Servicios web bajo su control" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "La descarga en ZIP está desactivada." @@ -54,15 +64,21 @@ msgstr "La descarga en ZIP está desactivada." msgid "Files need to be downloaded one by one." msgstr "Los archivos deben ser descargados uno por uno." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Volver a Archivos" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "no pudo ser determinado" @@ -190,58 +206,62 @@ msgstr "Su servidor web aún no está configurado adecuadamente para permitir si msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "hace segundos" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "hace 1 minuto" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "hace %d minutos" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "Hace 1 hora" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "Hace %d horas" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "hoy" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "ayer" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "hace %d días" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "mes pasado" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "Hace %d meses" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "año pasado" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "hace años" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po index 38a942ff168..0797fe2fa94 100644 --- a/l10n/es_AR/lib.po +++ b/l10n/es_AR/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: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" -"Last-Translator: cjtess <claudio.tessone@gmail.com>\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" +"Last-Translator: I Robot <owncloud-bot@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" @@ -42,10 +42,20 @@ msgstr "Apps" msgid "Admin" msgstr "Administración" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "servicios web sobre los que tenés control" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "La descarga en ZIP está desactivada." @@ -54,15 +64,21 @@ msgstr "La descarga en ZIP está desactivada." msgid "Files need to be downloaded one by one." msgstr "Los archivos deben ser descargados de a uno." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Volver a Archivos" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "no se pudo determinar" @@ -190,58 +206,62 @@ msgstr "Tu servidor web no está configurado todavía para permitir sincronizaci msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "segundos atrás" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "hace 1 minuto" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "hace %d minutos" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "hace 1 hora" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "hace %d horas" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "hoy" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "ayer" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "hace %d días" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "el mes pasado" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "hace %d meses" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "el año pasado" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "años atrás" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po index 1b9b1c58535..4286a1d97e1 100644 --- a/l10n/et_EE/lib.po +++ b/l10n/et_EE/lib.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" @@ -43,10 +43,20 @@ msgstr "Rakendused" msgid "Admin" msgstr "Admin" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "veebitenused sinu kontrolli all" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "ZIP-ina allalaadimine on välja lülitatud." @@ -55,15 +65,21 @@ msgstr "ZIP-ina allalaadimine on välja lülitatud." msgid "Files need to be downloaded one by one." msgstr "Failid tuleb alla laadida ükshaaval." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Tagasi failide juurde" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Valitud failid on ZIP-faili loomiseks liiga suured." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "ei suudetud tuvastada" @@ -191,58 +207,62 @@ msgstr "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide s msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "sekundit tagasi" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 minut tagasi" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d minutit tagasi" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 tund tagasi" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d tundi tagasi" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "täna" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "eile" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d päeva tagasi" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "viimasel kuul" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d kuud tagasi" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "viimasel aastal" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "aastat tagasi" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po index 3392305b6c8..d6eb8e82646 100644 --- a/l10n/et_EE/settings.po +++ b/l10n/et_EE/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:55+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-23 09:30+0000\n" +"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\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" @@ -277,12 +277,12 @@ msgstr "Luba kasutajatel jagada kirjeid avalike linkidega" #: templates/admin.php:153 msgid "Allow public uploads" -msgstr "" +msgstr "Luba avalikud üleslaadimised" #: templates/admin.php:154 msgid "" "Allow users to enable others to upload into their publicly shared folders" -msgstr "" +msgstr "Luba kasutajatel üleslaadimine teiste poolt oma avalikult jagatud kataloogidesse " #: templates/admin.php:162 msgid "Allow resharing" diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po index 0dcf6164934..d34f67e8c9c 100644 --- a/l10n/eu/lib.po +++ b/l10n/eu/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: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" -"Last-Translator: Piarres Beobide <pi@beobide.net>\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" +"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,10 +42,20 @@ msgstr "Aplikazioak" msgid "Admin" msgstr "Admin" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "web zerbitzuak zure kontrolpean" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "ZIP deskarga ez dago gaituta." @@ -54,15 +64,21 @@ msgstr "ZIP deskarga ez dago gaituta." msgid "Files need to be downloaded one by one." msgstr "Fitxategiak banan-banan deskargatu behar dira." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Itzuli fitxategietara" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "ezin izan da zehaztu" @@ -190,58 +206,62 @@ msgstr "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sin msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Mesedez begiratu <a href='%s'>instalazio gidak</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "segundu" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "orain dela minutu 1" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "orain dela %d minutu" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "orain dela ordu bat" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "orain dela %d ordu" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "gaur" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "atzo" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "orain dela %d egun" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "joan den hilabetean" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "orain dela %d hilabete" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "joan den urtean" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "urte" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po index 1fd173c4dc9..ecfe7c69a3b 100644 --- a/l10n/fa/lib.po +++ b/l10n/fa/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: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" -"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" +"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,10 +42,20 @@ msgstr " برنامه ها" msgid "Admin" msgstr "مدیر" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "سرویس های تحت وب در کنترل شما" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "دانلود به صورت فشرده غیر فعال است" @@ -54,15 +64,21 @@ msgstr "دانلود به صورت فشرده غیر فعال است" msgid "Files need to be downloaded one by one." msgstr "فایل ها باید به صورت یکی یکی دانلود شوند" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "بازگشت به فایل ها" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "فایل های انتخاب شده بزرگتر از آن هستند که بتوان یک فایل فشرده تولید کرد" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "نمیتواند مشخص شود" @@ -190,58 +206,62 @@ msgstr "احتمالاً وب سرور شما طوری تنظیم نشده اس msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "ثانیهها پیش" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 دقیقه پیش" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d دقیقه پیش" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 ساعت پیش" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d ساعت پیش" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "امروز" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "دیروز" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d روز پیش" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "ماه قبل" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%dماه پیش" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "سال قبل" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "سالهای قبل" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po index 58c52b0dac9..ca512563c65 100644 --- a/l10n/fi_FI/lib.po +++ b/l10n/fi_FI/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Sovellukset" msgid "Admin" msgstr "Ylläpitäjä" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "verkkopalvelut hallinnassasi" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "ZIP-lataus on poistettu käytöstä." @@ -54,15 +64,21 @@ msgstr "ZIP-lataus on poistettu käytöstä." msgid "Files need to be downloaded one by one." msgstr "Tiedostot on ladattava yksittäin." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Takaisin tiedostoihin" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "ei voitu määrittää" @@ -190,58 +206,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Lue tarkasti <a href='%s'>asennusohjeet</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "sekuntia sitten" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 minuutti sitten" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d minuuttia sitten" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 tunti sitten" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d tuntia sitten" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "tänään" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "eilen" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d päivää sitten" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "viime kuussa" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d kuukautta sitten" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "viime vuonna" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "vuotta sitten" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po index 8237e512ae3..dcb8bc19a2b 100644 --- a/l10n/fr/lib.po +++ b/l10n/fr/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Applications" msgid "Admin" msgstr "Administration" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "services web sous votre contrôle" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Téléchargement ZIP désactivé." @@ -54,15 +64,21 @@ msgstr "Téléchargement ZIP désactivé." msgid "Files need to be downloaded one by one." msgstr "Les fichiers nécessitent d'être téléchargés un par un." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Retour aux Fichiers" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Les fichiers sélectionnés sont trop volumineux pour être compressés." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "impossible à déterminer" @@ -190,58 +206,62 @@ msgstr "Votre serveur web, n'est pas correctement configuré pour permettre la s msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Veuillez vous référer au <a href='%s'>guide d'installation</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "il y a quelques secondes" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "il y a une minute" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "il y a %d minutes" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "Il y a une heure" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "Il y a %d heures" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "aujourd'hui" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "hier" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "il y a %d jours" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "le mois dernier" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "Il y a %d mois" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "l'année dernière" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "il y a plusieurs années" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po index e94df659b8f..d91186c5b8e 100644 --- a/l10n/gl/lib.po +++ b/l10n/gl/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Aplicativos" msgid "Admin" msgstr "Administración" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "servizos web baixo o seu control" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "As descargas ZIP están desactivadas." @@ -54,15 +64,21 @@ msgstr "As descargas ZIP están desactivadas." msgid "Files need to be downloaded one by one." msgstr "Os ficheiros necesitan seren descargados dun en un." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Volver aos ficheiros" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "non foi posíbel determinalo" @@ -190,58 +206,62 @@ msgstr "O seu servidor web non está aínda configurado adecuadamente para permi msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Volva comprobar as <a href='%s'>guías de instalación</a>" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "segundos atrás" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "hai 1 minuto" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "hai %d minutos" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "Vai 1 hora" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "Vai %d horas" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "hoxe" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "onte" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "hai %d días" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "último mes" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "Vai %d meses" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "último ano" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "anos atrás" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po index 561654b2127..d82cc9352e4 100644 --- a/l10n/gl/settings.po +++ b/l10n/gl/settings.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:55+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-23 17:20+0000\n" +"Last-Translator: mbouzada <mbouzada@gmail.com>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -276,12 +276,12 @@ msgstr "Permitir que os usuarios compartan elementos ao público con ligazóns" #: templates/admin.php:153 msgid "Allow public uploads" -msgstr "" +msgstr "Permitir os envíos públicos" #: templates/admin.php:154 msgid "" "Allow users to enable others to upload into their publicly shared folders" -msgstr "" +msgstr "Permitir que os usuarios lle permitan a outros enviar aos seus cartafoles compartidos publicamente" #: templates/admin.php:162 msgid "Allow resharing" diff --git a/l10n/he/lib.po b/l10n/he/lib.po index 89e77e4bfd4..bb79451d05b 100644 --- a/l10n/he/lib.po +++ b/l10n/he/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "יישומים" msgid "Admin" msgstr "מנהל" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "שירותי רשת תחת השליטה שלך" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "הורדת ZIP כבויה" @@ -53,15 +63,21 @@ msgstr "הורדת ZIP כבויה" msgid "Files need to be downloaded one by one." msgstr "יש להוריד את הקבצים אחד אחרי השני." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "חזרה לקבצים" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "הקבצים הנבחרים גדולים מידי ליצירת קובץ zip." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -189,58 +205,62 @@ msgstr "שרת האינטרנט שלך אינו מוגדר לצורכי סנכר msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "שניות" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "לפני דקה אחת" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "לפני %d דקות" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "לפני שעה" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "לפני %d שעות" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "היום" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "אתמול" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "לפני %d ימים" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "חודש שעבר" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "לפני %d חודשים" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "שנה שעברה" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "שנים" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po index 89421ef4901..4c585172851 100644 --- a/l10n/hi/lib.po +++ b/l10n/hi/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-22 06:02+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "Apps" msgid "Admin" msgstr "" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "" @@ -53,15 +63,21 @@ msgstr "" msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -189,58 +205,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po index bc3342a20b7..d7ad1c61c97 100644 --- a/l10n/hr/lib.po +++ b/l10n/hr/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "Aplikacije" msgid "Admin" msgstr "Administrator" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "web usluge pod vašom kontrolom" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "" @@ -53,15 +63,21 @@ msgstr "" msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -189,58 +205,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "sekundi prije" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "danas" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "jučer" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "prošli mjesec" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "prošlu godinu" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "godina" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po index dbde5e9a4ab..e008f3406a9 100644 --- a/l10n/hu_HU/lib.po +++ b/l10n/hu_HU/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Alkalmazások" msgid "Admin" msgstr "Adminsztráció" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "webszolgáltatások saját kézben" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "A ZIP-letöltés nincs engedélyezve." @@ -54,15 +64,21 @@ msgstr "A ZIP-letöltés nincs engedélyezve." msgid "Files need to be downloaded one by one." msgstr "A fájlokat egyenként kell letölteni." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Vissza a Fájlokhoz" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "A kiválasztott fájlok túl nagyok a zip tömörítéshez." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "nem határozható meg" @@ -190,58 +206,62 @@ msgstr "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "pár másodperce" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 perce" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d perce" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 órája" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d órája" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "ma" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "tegnap" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d napja" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "múlt hónapban" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d hónapja" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "tavaly" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "több éve" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/hy/lib.po b/l10n/hy/lib.po index 07d46915210..40f120e5355 100644 --- a/l10n/hy/lib.po +++ b/l10n/hy/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-05 02:13+0200\n" -"PO-Revision-Date: 2013-07-05 00:13+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n" "MIME-Version: 1.0\n" @@ -41,27 +41,43 @@ msgstr "" msgid "Admin" msgstr "" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "" -#: files.php:210 +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + +#: files.php:226 msgid "ZIP download is turned off." msgstr "" -#: files.php:211 +#: files.php:227 msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:212 files.php:245 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:242 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -170,77 +186,81 @@ msgstr "" msgid "PostgreSQL username and/or password not valid" msgstr "" -#: setup.php:42 +#: setup.php:28 msgid "Set an admin username." msgstr "" -#: setup.php:45 +#: setup.php:31 msgid "Set an admin password." msgstr "" -#: setup.php:198 +#: setup.php:184 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." msgstr "" -#: setup.php:199 +#: setup.php:185 #, php-format msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:113 +#: template/functions.php:80 msgid "seconds ago" msgstr "" -#: template.php:114 +#: template/functions.php:81 msgid "1 minute ago" msgstr "" -#: template.php:115 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:116 +#: template/functions.php:83 msgid "1 hour ago" msgstr "" -#: template.php:117 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:118 +#: template/functions.php:85 msgid "today" msgstr "" -#: template.php:119 +#: template/functions.php:86 msgid "yesterday" msgstr "" -#: template.php:120 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:121 +#: template/functions.php:88 msgid "last month" msgstr "" -#: template.php:122 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:123 +#: template/functions.php:90 msgid "last year" msgstr "" -#: template.php:124 +#: template/functions.php:91 msgid "years ago" msgstr "" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po index f39dedd713c..283c448b8e6 100644 --- a/l10n/ia/lib.po +++ b/l10n/ia/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "Applicationes" msgid "Admin" msgstr "Administration" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "servicios web sub tu controlo" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "" @@ -53,15 +63,21 @@ msgstr "" msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -189,58 +205,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/id/lib.po b/l10n/id/lib.po index 94f6deecc5a..7d7e86cd29a 100644 --- a/l10n/id/lib.po +++ b/l10n/id/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "Aplikasi" msgid "Admin" msgstr "Admin" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "layanan web dalam kontrol Anda" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Pengunduhan ZIP dimatikan." @@ -53,15 +63,21 @@ msgstr "Pengunduhan ZIP dimatikan." msgid "Files need to be downloaded one by one." msgstr "Berkas harus diunduh satu persatu." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Kembali ke Daftar Berkas" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Berkas yang dipilih terlalu besar untuk dibuat berkas zip-nya." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "tidak dapat ditentukan" @@ -189,58 +205,62 @@ msgstr "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sin msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Silakan periksa ulang <a href='%s'>panduan instalasi</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "beberapa detik yang lalu" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 menit yang lalu" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d menit yang lalu" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 jam yang lalu" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d jam yang lalu" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "hari ini" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "kemarin" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d hari yang lalu" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "bulan kemarin" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d bulan yang lalu" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "tahun kemarin" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "beberapa tahun lalu" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/is/lib.po b/l10n/is/lib.po index 80ce920a55f..ad927007a61 100644 --- a/l10n/is/lib.po +++ b/l10n/is/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "Forrit" msgid "Admin" msgstr "Stjórnun" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "vefþjónusta undir þinni stjórn" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Slökkt á ZIP niðurhali." @@ -53,15 +63,21 @@ msgstr "Slökkt á ZIP niðurhali." msgid "Files need to be downloaded one by one." msgstr "Skrárnar verður að sækja eina og eina" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Aftur í skrár" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Valdar skrár eru of stórar til að búa til ZIP skrá." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -189,58 +205,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "sek." -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "Fyrir 1 mínútu" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "fyrir %d mínútum" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "Fyrir 1 klst." -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "fyrir %d klst." -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "í dag" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "í gær" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "fyrir %d dögum" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "síðasta mánuði" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "fyrir %d mánuðum" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "síðasta ári" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "einhverjum árum" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/it/lib.po b/l10n/it/lib.po index ca491c64f0e..366d47f7892 100644 --- a/l10n/it/lib.po +++ b/l10n/it/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: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" -"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" +"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,10 +42,20 @@ msgstr "Applicazioni" msgid "Admin" msgstr "Admin" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "servizi web nelle tue mani" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Lo scaricamento in formato ZIP è stato disabilitato." @@ -54,15 +64,21 @@ msgstr "Lo scaricamento in formato ZIP è stato disabilitato." msgid "Files need to be downloaded one by one." msgstr "I file devono essere scaricati uno alla volta." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Torna ai file" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "I file selezionati sono troppo grandi per generare un file zip." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "non può essere determinato" @@ -190,58 +206,62 @@ msgstr "Il tuo server web non è configurato correttamente per consentire la sin msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Leggi attentamente le <a href='%s'>guide d'installazione</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "secondi fa" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "Un minuto fa" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d minuti fa" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 ora fa" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d ore fa" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "oggi" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "ieri" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d giorni fa" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "mese scorso" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d mesi fa" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "anno scorso" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "anni fa" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/it/settings.po b/l10n/it/settings.po index 3f5ba6d2638..58fa949610d 100644 --- a/l10n/it/settings.po +++ b/l10n/it/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: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:55+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-23 08:20+0000\n" +"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -278,12 +278,12 @@ msgstr "Consenti agli utenti di condividere pubblicamente elementi tramite colle #: templates/admin.php:153 msgid "Allow public uploads" -msgstr "" +msgstr "Consenti caricamenti pubblici" #: templates/admin.php:154 msgid "" "Allow users to enable others to upload into their publicly shared folders" -msgstr "" +msgstr "Consenti agli utenti di abilitare altri al caricamento nelle loro cartelle pubbliche condivise" #: templates/admin.php:162 msgid "Allow resharing" diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po index 6de2d481c21..a9bfe0203ff 100644 --- a/l10n/ja_JP/lib.po +++ b/l10n/ja_JP/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "アプリ" msgid "Admin" msgstr "管理" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "管理下のウェブサービス" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "ZIPダウンロードは無効です。" @@ -54,15 +64,21 @@ msgstr "ZIPダウンロードは無効です。" msgid "Files need to be downloaded one by one." msgstr "ファイルは1つずつダウンロードする必要があります。" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "ファイルに戻る" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "選択したファイルはZIPファイルの生成には大きすぎます。" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "測定できませんでした" @@ -190,58 +206,62 @@ msgstr "WebDAVインタフェースが動作していないと考えられるた msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "<a href='%s'>インストールガイド</a>をよく確認してください。" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "数秒前" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 分前" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d 分前" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 時間前" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d 時間前" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "今日" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "昨日" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d 日前" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "一月前" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d 分前" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "一年前" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "年前" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/ka/lib.po b/l10n/ka/lib.po index 4fa2845d636..5cfcfa245f7 100644 --- a/l10n/ka/lib.po +++ b/l10n/ka/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-05 02:13+0200\n" -"PO-Revision-Date: 2013-07-05 00:13+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n" "MIME-Version: 1.0\n" @@ -41,27 +41,43 @@ msgstr "" msgid "Admin" msgstr "ადმინისტრატორი" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "" -#: files.php:210 +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + +#: files.php:226 msgid "ZIP download is turned off." msgstr "ZIP გადმოწერა გამორთულია" -#: files.php:211 +#: files.php:227 msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:212 files.php:245 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:242 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -170,77 +186,81 @@ msgstr "" msgid "PostgreSQL username and/or password not valid" msgstr "" -#: setup.php:42 +#: setup.php:28 msgid "Set an admin username." msgstr "" -#: setup.php:45 +#: setup.php:31 msgid "Set an admin password." msgstr "" -#: setup.php:198 +#: setup.php:184 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." msgstr "" -#: setup.php:199 +#: setup.php:185 #, php-format msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:113 +#: template/functions.php:80 msgid "seconds ago" msgstr "წამის წინ" -#: template.php:114 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 წუთის წინ" -#: template.php:115 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d წუთის წინ" -#: template.php:116 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 საათის წინ" -#: template.php:117 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:118 +#: template/functions.php:85 msgid "today" msgstr "დღეს" -#: template.php:119 +#: template/functions.php:86 msgid "yesterday" msgstr "გუშინ" -#: template.php:120 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d დღის წინ" -#: template.php:121 +#: template/functions.php:88 msgid "last month" msgstr "" -#: template.php:122 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:123 +#: template/functions.php:90 msgid "last year" msgstr "" -#: template.php:124 +#: template/functions.php:91 msgid "years ago" msgstr "" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po index d68e2c07874..499f821fb1f 100644 --- a/l10n/ka_GE/lib.po +++ b/l10n/ka_GE/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "აპლიკაციები" msgid "Admin" msgstr "ადმინისტრატორი" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "web services under your control" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "ZIP download–ი გათიშულია" @@ -53,15 +63,21 @@ msgstr "ZIP download–ი გათიშულია" msgid "Files need to be downloaded one by one." msgstr "ფაილები უნდა გადმოიტვირთოს სათითაოდ." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "უკან ფაილებში" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "არჩეული ფაილები ძალიან დიდია zip ფაილის გენერაციისთვის." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "ვერ განისაზღვრა" @@ -189,58 +205,62 @@ msgstr "თქვენი web სერვერი არ არის კო msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "წამის წინ" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 წუთის წინ" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d წუთის წინ" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 საათის წინ" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d საათის წინ" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "დღეს" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "გუშინ" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d დღის წინ" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "გასულ თვეში" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d თვის წინ" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "ბოლო წელს" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "წლის წინ" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/kn/lib.po b/l10n/kn/lib.po index 308114917bc..9b637e4cf9f 100644 --- a/l10n/kn/lib.po +++ b/l10n/kn/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-05 02:13+0200\n" -"PO-Revision-Date: 2013-07-05 00:13+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n" "MIME-Version: 1.0\n" @@ -41,27 +41,43 @@ msgstr "" msgid "Admin" msgstr "" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "" -#: files.php:210 +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + +#: files.php:226 msgid "ZIP download is turned off." msgstr "" -#: files.php:211 +#: files.php:227 msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:212 files.php:245 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:242 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -170,77 +186,81 @@ msgstr "" msgid "PostgreSQL username and/or password not valid" msgstr "" -#: setup.php:42 +#: setup.php:28 msgid "Set an admin username." msgstr "" -#: setup.php:45 +#: setup.php:31 msgid "Set an admin password." msgstr "" -#: setup.php:198 +#: setup.php:184 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." msgstr "" -#: setup.php:199 +#: setup.php:185 #, php-format msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:113 +#: template/functions.php:80 msgid "seconds ago" msgstr "" -#: template.php:114 +#: template/functions.php:81 msgid "1 minute ago" msgstr "" -#: template.php:115 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:116 +#: template/functions.php:83 msgid "1 hour ago" msgstr "" -#: template.php:117 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:118 +#: template/functions.php:85 msgid "today" msgstr "" -#: template.php:119 +#: template/functions.php:86 msgid "yesterday" msgstr "" -#: template.php:120 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:121 +#: template/functions.php:88 msgid "last month" msgstr "" -#: template.php:122 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:123 +#: template/functions.php:90 msgid "last year" msgstr "" -#: template.php:124 +#: template/functions.php:91 msgid "years ago" msgstr "" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po index b9b2527be06..720609c125c 100644 --- a/l10n/ko/lib.po +++ b/l10n/ko/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: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" -"Last-Translator: smallsnail <bjh13579@gmail.com>\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" +"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,10 +42,20 @@ msgstr "앱" msgid "Admin" msgstr "관리자" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "내가 관리하는 웹 서비스" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "ZIP 다운로드가 비활성화되었습니다." @@ -54,15 +64,21 @@ msgstr "ZIP 다운로드가 비활성화되었습니다." msgid "Files need to be downloaded one by one." msgstr "파일을 개별적으로 다운로드해야 합니다." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "파일로 돌아가기" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "선택한 파일들은 ZIP 파일을 생성하기에 너무 큽니다." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "결정할 수 없음" @@ -190,58 +206,62 @@ msgstr "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서 msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "초 전" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1분 전" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d분 전" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1시간 전" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d시간 전" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "오늘" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "어제" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d일 전" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "지난 달" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d개월 전" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "작년" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "년 전" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po index c3c469f9600..3c562c92d4c 100644 --- a/l10n/ku_IQ/lib.po +++ b/l10n/ku_IQ/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-22 06:02+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "بهرنامهكان" msgid "Admin" msgstr "بهڕێوهبهری سهرهكی" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "ڕاژهی وێب لهژێر چاودێریت دایه" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "" @@ -53,15 +63,21 @@ msgstr "" msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -189,58 +205,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po index cf966802a75..12f02c1dd41 100644 --- a/l10n/lb/lib.po +++ b/l10n/lb/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Applikatiounen" msgid "Admin" msgstr "Admin" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "Web-Servicer ënnert denger Kontroll" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "" @@ -54,15 +64,21 @@ msgstr "" msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -190,58 +206,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "Sekonnen hir" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 Minutt hir" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "vrun 1 Stonn" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "haut" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "gëschter" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "Läschte Mount" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "Läscht Joer" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "Joren hier" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po index 7885517e31f..c91fa67de3c 100644 --- a/l10n/lt_LT/lib.po +++ b/l10n/lt_LT/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Programos" msgid "Admin" msgstr "Administravimas" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "jūsų valdomos web paslaugos" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "ZIP atsisiuntimo galimybė yra išjungta." @@ -54,15 +64,21 @@ msgstr "ZIP atsisiuntimo galimybė yra išjungta." msgid "Files need to be downloaded one by one." msgstr "Failai turi būti parsiunčiami vienas po kito." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Atgal į Failus" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Pasirinkti failai per dideli archyvavimui į ZIP." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -190,58 +206,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "prieš sekundę" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "Prieš 1 minutę" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "prieš %d minučių" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "prieš 1 valandą" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "prieš %d valandų" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "šiandien" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "vakar" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "prieš %d dienų" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "praeitą mėnesį" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "prieš %d mėnesių" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "praeitais metais" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "prieš metus" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po index fbd234584d2..bf2fd831db6 100644 --- a/l10n/lv/lib.po +++ b/l10n/lv/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "Lietotnes" msgid "Admin" msgstr "Administratori" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "tīmekļa servisi tavā varā" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "ZIP lejupielādēšana ir izslēgta." @@ -53,15 +63,21 @@ msgstr "ZIP lejupielādēšana ir izslēgta." msgid "Files need to be downloaded one by one." msgstr "Datnes var lejupielādēt tikai katru atsevišķi." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Atpakaļ pie datnēm" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Izvēlētās datnes ir pārāk lielas, lai izveidotu zip datni." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "nevarēja noteikt" @@ -189,58 +205,62 @@ msgstr "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datn msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "sekundes atpakaļ" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "pirms 1 minūtes" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "pirms %d minūtēm" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "pirms 1 stundas" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "pirms %d stundām" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "šodien" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "vakar" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "pirms %d dienām" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "pagājušajā mēnesī" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "pirms %d mēnešiem" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "gājušajā gadā" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "gadus atpakaļ" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po index 2a9f839d23b..836a3490761 100644 --- a/l10n/mk/lib.po +++ b/l10n/mk/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "Аппликации" msgid "Admin" msgstr "Админ" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "веб сервиси под Ваша контрола" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Преземање во ZIP е исклучено" @@ -53,15 +63,21 @@ msgstr "Преземање во ZIP е исклучено" msgid "Files need to be downloaded one by one." msgstr "Датотеките треба да се симнат една по една." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Назад кон датотеки" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Избраните датотеки се преголеми за да се генерира zip." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -189,58 +205,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "пред секунди" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "пред 1 минута" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "пред %d минути" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "пред 1 час" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "пред %d часови" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "денеска" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "вчера" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "пред %d денови" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "минатиот месец" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "пред %d месеци" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "минатата година" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "пред години" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/ml_IN/lib.po b/l10n/ml_IN/lib.po index d4532ad9a44..8590f74b674 100644 --- a/l10n/ml_IN/lib.po +++ b/l10n/ml_IN/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-06 02:02+0200\n" -"PO-Revision-Date: 2013-07-05 08:25+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n" "MIME-Version: 1.0\n" @@ -41,27 +41,43 @@ msgstr "" msgid "Admin" msgstr "" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "" -#: files.php:210 +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + +#: files.php:226 msgid "ZIP download is turned off." msgstr "" -#: files.php:211 +#: files.php:227 msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:212 files.php:245 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:242 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -170,77 +186,81 @@ msgstr "" msgid "PostgreSQL username and/or password not valid" msgstr "" -#: setup.php:42 +#: setup.php:28 msgid "Set an admin username." msgstr "" -#: setup.php:45 +#: setup.php:31 msgid "Set an admin password." msgstr "" -#: setup.php:198 +#: setup.php:184 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." msgstr "" -#: setup.php:199 +#: setup.php:185 #, php-format msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:113 +#: template/functions.php:80 msgid "seconds ago" msgstr "" -#: template.php:114 +#: template/functions.php:81 msgid "1 minute ago" msgstr "" -#: template.php:115 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:116 +#: template/functions.php:83 msgid "1 hour ago" msgstr "" -#: template.php:117 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:118 +#: template/functions.php:85 msgid "today" msgstr "" -#: template.php:119 +#: template/functions.php:86 msgid "yesterday" msgstr "" -#: template.php:120 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:121 +#: template/functions.php:88 msgid "last month" msgstr "" -#: template.php:122 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:123 +#: template/functions.php:90 msgid "last year" msgstr "" -#: template.php:124 +#: template/functions.php:91 msgid "years ago" msgstr "" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po index c5de62287d4..d0deb26d3fa 100644 --- a/l10n/ms_MY/lib.po +++ b/l10n/ms_MY/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "Aplikasi" msgid "Admin" msgstr "Admin" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "Perkhidmatan web di bawah kawalan anda" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "" @@ -53,15 +63,21 @@ msgstr "" msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -189,58 +205,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po index 885131eea59..5b05b4a9110 100644 --- a/l10n/my_MM/lib.po +++ b/l10n/my_MM/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "Apps" msgid "Admin" msgstr "အက်ဒမင်" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "ZIP ဒေါင်းလုတ်ကိုပိတ်ထားသည်" @@ -53,15 +63,21 @@ msgstr "ZIP ဒေါင်းလုတ်ကိုပိတ်ထားသည msgid "Files need to be downloaded one by one." msgstr "ဖိုင်များသည် တစ်ခုပြီး တစ်ခုဒေါင်းလုတ်ချရန်လိုအပ်သည်" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "ဖိုင်သို့ပြန်သွားမည်" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "zip ဖိုင်အဖြစ်ပြုလုပ်ရန် ရွေးချယ်ထားသောဖိုင်များသည် အရမ်းကြီးလွန်းသည်" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "မဆုံးဖြတ်နိုင်ပါ။" @@ -189,58 +205,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "စက္ကန့်အနည်းငယ်က" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "၁ မိနစ်အရင်က" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d မိနစ်အရင်က" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "၁ နာရီ အရင်က" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d နာရီအရင်က" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "ယနေ့" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "မနေ့က" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d ရက် အရင်က" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "ပြီးခဲ့သောလ" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d လအရင်က" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "မနှစ်က" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "နှစ် အရင်က" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po index 69addf2420e..76f78665fa8 100644 --- a/l10n/nb_NO/core.po +++ b/l10n/nb_NO/core.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Stein-Aksel Basma <stabasm@hotmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:04+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-23 21:56+0000\n" +"Last-Translator: Stein-Aksel Basma <stabasm@hotmail.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,7 +21,7 @@ msgstr "" #: ajax/share.php:97 #, php-format msgid "%s shared »%s« with you" -msgstr "" +msgstr "%s delte »%s« med deg" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -33,7 +34,7 @@ msgstr "Ingen kategorier å legge til?" #: ajax/vcategories/add.php:37 #, php-format msgid "This category already exists: %s" -msgstr "" +msgstr "Denne kategorien finnes allerede: %s" #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27 #: ajax/vcategories/favorites.php:24 @@ -225,8 +226,8 @@ msgstr "" #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195 -#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:625 -#: js/share.js:637 +#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149 +#: js/share.js:631 js/share.js:643 msgid "Error" msgstr "Feil" @@ -240,129 +241,129 @@ msgstr "" #: js/share.js:30 js/share.js:45 js/share.js:87 msgid "Shared" -msgstr "" +msgstr "Delt" #: js/share.js:90 msgid "Share" msgstr "Del" -#: js/share.js:125 js/share.js:665 +#: js/share.js:131 js/share.js:671 msgid "Error while sharing" msgstr "Feil under deling" -#: js/share.js:136 +#: js/share.js:142 msgid "Error while unsharing" msgstr "" -#: js/share.js:143 +#: js/share.js:149 msgid "Error while changing permissions" msgstr "" -#: js/share.js:152 +#: js/share.js:158 msgid "Shared with you and the group {group} by {owner}" msgstr "" -#: js/share.js:154 +#: js/share.js:160 msgid "Shared with you by {owner}" -msgstr "" +msgstr "Delt med deg av {owner}" -#: js/share.js:177 +#: js/share.js:183 msgid "Share with" msgstr "Del med" -#: js/share.js:182 +#: js/share.js:188 msgid "Share with link" msgstr "Del med link" -#: js/share.js:185 +#: js/share.js:191 msgid "Password protect" msgstr "Passordbeskyttet" -#: js/share.js:187 templates/installation.php:54 templates/login.php:26 +#: js/share.js:193 templates/installation.php:54 templates/login.php:26 msgid "Password" msgstr "Passord" -#: js/share.js:192 +#: js/share.js:198 msgid "Allow Public Upload" msgstr "" -#: js/share.js:196 +#: js/share.js:202 msgid "Email link to person" msgstr "" -#: js/share.js:197 +#: js/share.js:203 msgid "Send" msgstr "Send" -#: js/share.js:202 +#: js/share.js:208 msgid "Set expiration date" msgstr "Set utløpsdato" -#: js/share.js:203 +#: js/share.js:209 msgid "Expiration date" msgstr "Utløpsdato" -#: js/share.js:235 +#: js/share.js:241 msgid "Share via email:" msgstr "Del på epost" -#: js/share.js:237 +#: js/share.js:243 msgid "No people found" msgstr "Ingen personer funnet" -#: js/share.js:275 +#: js/share.js:281 msgid "Resharing is not allowed" msgstr "" -#: js/share.js:311 +#: js/share.js:317 msgid "Shared in {item} with {user}" msgstr "" -#: js/share.js:332 +#: js/share.js:338 msgid "Unshare" msgstr "Avslutt deling" -#: js/share.js:344 +#: js/share.js:350 msgid "can edit" msgstr "kan endre" -#: js/share.js:346 +#: js/share.js:352 msgid "access control" msgstr "tilgangskontroll" -#: js/share.js:349 +#: js/share.js:355 msgid "create" msgstr "opprett" -#: js/share.js:352 +#: js/share.js:358 msgid "update" msgstr "oppdater" -#: js/share.js:355 +#: js/share.js:361 msgid "delete" msgstr "slett" -#: js/share.js:358 +#: js/share.js:364 msgid "share" msgstr "del" -#: js/share.js:392 js/share.js:612 +#: js/share.js:398 js/share.js:618 msgid "Password protected" msgstr "Passordbeskyttet" -#: js/share.js:625 +#: js/share.js:631 msgid "Error unsetting expiration date" msgstr "" -#: js/share.js:637 +#: js/share.js:643 msgid "Error setting expiration date" msgstr "Kan ikke sette utløpsdato" -#: js/share.js:652 +#: js/share.js:658 msgid "Sending ..." msgstr "Sender..." -#: js/share.js:663 +#: js/share.js:669 msgid "Email sent" msgstr "E-post sendt" @@ -474,7 +475,7 @@ msgid "" "View it: %s\n" "\n" "Cheers!" -msgstr "" +msgstr "Hei der.⏎\n⏎\nVille bare gjøre deg oppmerksom på at %s delte %s med deg.⏎\nVis den: %s⏎\n⏎\nVI ses!" #: templates/edit_categories_dialog.php:4 msgid "Edit categories" @@ -625,4 +626,4 @@ msgstr "neste" #: templates/update.php:3 #, php-format msgid "Updating ownCloud to version %s, this may take a while." -msgstr "" +msgstr "Oppdaterer ownCloud til versjon %s, dette kan ta en stund." diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po index 39a99a6a775..771095599f9 100644 --- a/l10n/nb_NO/lib.po +++ b/l10n/nb_NO/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@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" @@ -41,10 +41,20 @@ msgstr "Apper" msgid "Admin" msgstr "Admin" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "web tjenester du kontrollerer" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "ZIP-nedlasting av avslått" @@ -53,15 +63,21 @@ msgstr "ZIP-nedlasting av avslått" msgid "Files need to be downloaded one by one." msgstr "Filene må lastes ned en om gangen" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Tilbake til filer" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "De valgte filene er for store til å kunne generere ZIP-fil" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -189,58 +205,62 @@ msgstr "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "sekunder siden" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 minutt siden" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d minutter siden" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 time siden" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d timer siden" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "i dag" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "i går" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d dager siden" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "forrige måned" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d måneder siden" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "forrige år" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "år siden" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/ne/lib.po b/l10n/ne/lib.po index 37489e0ed64..5445c8e816c 100644 --- a/l10n/ne/lib.po +++ b/l10n/ne/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-05 02:13+0200\n" -"PO-Revision-Date: 2013-07-05 00:13+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n" "MIME-Version: 1.0\n" @@ -41,27 +41,43 @@ msgstr "" msgid "Admin" msgstr "" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "" -#: files.php:210 +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + +#: files.php:226 msgid "ZIP download is turned off." msgstr "" -#: files.php:211 +#: files.php:227 msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:212 files.php:245 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:242 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -170,77 +186,81 @@ msgstr "" msgid "PostgreSQL username and/or password not valid" msgstr "" -#: setup.php:42 +#: setup.php:28 msgid "Set an admin username." msgstr "" -#: setup.php:45 +#: setup.php:31 msgid "Set an admin password." msgstr "" -#: setup.php:198 +#: setup.php:184 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." msgstr "" -#: setup.php:199 +#: setup.php:185 #, php-format msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:113 +#: template/functions.php:80 msgid "seconds ago" msgstr "" -#: template.php:114 +#: template/functions.php:81 msgid "1 minute ago" msgstr "" -#: template.php:115 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:116 +#: template/functions.php:83 msgid "1 hour ago" msgstr "" -#: template.php:117 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:118 +#: template/functions.php:85 msgid "today" msgstr "" -#: template.php:119 +#: template/functions.php:86 msgid "yesterday" msgstr "" -#: template.php:120 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:121 +#: template/functions.php:88 msgid "last month" msgstr "" -#: template.php:122 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:123 +#: template/functions.php:90 msgid "last year" msgstr "" -#: template.php:124 +#: template/functions.php:91 msgid "years ago" msgstr "" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po index f301504ebff..9f001941d0f 100644 --- a/l10n/nl/lib.po +++ b/l10n/nl/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Apps" msgid "Admin" msgstr "Beheerder" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "Webdiensten in eigen beheer" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "ZIP download is uitgeschakeld." @@ -54,15 +64,21 @@ msgstr "ZIP download is uitgeschakeld." msgid "Files need to be downloaded one by one." msgstr "Bestanden moeten één voor één worden gedownload." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Terug naar bestanden" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "De geselecteerde bestanden zijn te groot om een zip bestand te maken." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "kon niet worden vastgesteld" @@ -190,58 +206,62 @@ msgstr "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omda msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Controleer de <a href='%s'>installatiehandleiding</a> goed." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "seconden geleden" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 minuut geleden" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d minuten geleden" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 uur geleden" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d uren geleden" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "vandaag" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "gisteren" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d dagen geleden" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "vorige maand" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d maanden geleden" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "vorig jaar" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "jaar geleden" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po index 46d91a7e9c0..3ca8a975f7a 100644 --- a/l10n/nn_NO/lib.po +++ b/l10n/nn_NO/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Program" msgid "Admin" msgstr "Administrer" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "Vev tjenester under din kontroll" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "" @@ -54,15 +64,21 @@ msgstr "" msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -190,58 +206,62 @@ msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering s msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Ver vennleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "sekund sidan" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 minutt sidan" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 time sidan" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "i dag" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "i går" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "førre månad" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "i fjor" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "år sidan" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po index 09900debe20..9fd1bfbc343 100644 --- a/l10n/oc/lib.po +++ b/l10n/oc/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-22 06:02+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "Apps" msgid "Admin" msgstr "Admin" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "Services web jos ton contraròtle" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Avalcargar los ZIP es inactiu." @@ -53,15 +63,21 @@ msgstr "Avalcargar los ZIP es inactiu." msgid "Files need to be downloaded one by one." msgstr "Los fichièrs devan èsser avalcargats un per un." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Torna cap als fichièrs" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -189,58 +205,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "segonda a" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 minuta a" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d minutas a" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "uèi" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "ièr" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d jorns a" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "mes passat" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "an passat" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "ans a" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po index 3aadc964d2e..69554bc77cf 100644 --- a/l10n/pl/lib.po +++ b/l10n/pl/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Aplikacje" msgid "Admin" msgstr "Administrator" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "Kontrolowane serwisy" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Pobieranie ZIP jest wyłączone." @@ -54,15 +64,21 @@ msgstr "Pobieranie ZIP jest wyłączone." msgid "Files need to be downloaded one by one." msgstr "Pliki muszą zostać pobrane pojedynczo." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Wróć do plików" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Wybrane pliki są zbyt duże, aby wygenerować plik zip." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "nie może zostać znaleziony" @@ -190,58 +206,62 @@ msgstr "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożl msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "sekund temu" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 minutę temu" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d minut temu" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 godzinę temu" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d godzin temu" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "dziś" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "wczoraj" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d dni temu" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "w zeszłym miesiącu" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d miesiecy temu" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "w zeszłym roku" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "lat temu" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po index b64828ff2ba..15f63ba0d35 100644 --- a/l10n/pt_BR/lib.po +++ b/l10n/pt_BR/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Aplicações" msgid "Admin" msgstr "Admin" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "serviços web sob seu controle" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Download ZIP está desligado." @@ -54,15 +64,21 @@ msgstr "Download ZIP está desligado." msgid "Files need to be downloaded one by one." msgstr "Arquivos precisam ser baixados um de cada vez." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Voltar para Arquivos" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Arquivos selecionados são muito grandes para gerar arquivo zip." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "não pôde ser determinado" @@ -190,58 +206,62 @@ msgstr "Seu servidor web não está configurado corretamente para permitir sincr msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Por favor, confira os <a href='%s'>guias de instalação</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "segundos atrás" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 minuto atrás" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d minutos atrás" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 hora atrás" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d horas atrás" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "hoje" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "ontem" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d dias atrás" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "último mês" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d meses atrás" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "último ano" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "anos atrás" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po index 88fd0f853b1..d970d4b2083 100644 --- a/l10n/pt_BR/settings.po +++ b/l10n/pt_BR/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:55+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-23 11:20+0000\n" +"Last-Translator: Flávio Veras <flaviove@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" @@ -277,12 +277,12 @@ msgstr "Permitir que usuários compartilhem itens com o público usando links" #: templates/admin.php:153 msgid "Allow public uploads" -msgstr "" +msgstr "Permitir envio público" #: templates/admin.php:154 msgid "" "Allow users to enable others to upload into their publicly shared folders" -msgstr "" +msgstr "Permitir que usuários deem permissão a outros para enviarem arquivios para suas pastas compartilhadas publicamente" #: templates/admin.php:162 msgid "Allow resharing" diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po index b3c5a1d3c7c..9e69e8e33c9 100644 --- a/l10n/pt_PT/lib.po +++ b/l10n/pt_PT/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Aplicações" msgid "Admin" msgstr "Admin" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "serviços web sob o seu controlo" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Descarregamento em ZIP está desligado." @@ -54,15 +64,21 @@ msgstr "Descarregamento em ZIP está desligado." msgid "Files need to be downloaded one by one." msgstr "Os ficheiros precisam de ser descarregados um por um." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Voltar a Ficheiros" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Os ficheiros seleccionados são grandes demais para gerar um ficheiro zip." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "Não foi possível determinar" @@ -190,58 +206,62 @@ msgstr "O seu servidor web não está configurado correctamente para autorizar s msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Por favor verifique <a href='%s'>installation guides</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "Minutos atrás" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "Há 1 minuto" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "há %d minutos" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "Há 1 horas" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "Há %d horas" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "hoje" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "ontem" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "há %d dias" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "ultímo mês" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "Há %d meses atrás" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "ano passado" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "anos atrás" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po index 0e837673874..9dcc447b2b2 100644 --- a/l10n/ro/lib.po +++ b/l10n/ro/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "Aplicații" msgid "Admin" msgstr "Admin" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "servicii web controlate de tine" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Descărcarea ZIP este dezactivată." @@ -53,15 +63,21 @@ msgstr "Descărcarea ZIP este dezactivată." msgid "Files need to be downloaded one by one." msgstr "Fișierele trebuie descărcate unul câte unul." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Înapoi la fișiere" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Fișierele selectate sunt prea mari pentru a genera un fișier zip." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "nu poate fi determinat" @@ -189,58 +205,62 @@ msgstr "Serverul de web nu este încă setat corespunzător pentru a permite sin msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</ a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "secunde în urmă" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 minut în urmă" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d minute în urmă" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "Acum o ora" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d ore in urma" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "astăzi" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "ieri" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d zile în urmă" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "ultima lună" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d luni in urma" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "ultimul an" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "ani în urmă" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po index 79294a677a8..36029f07eec 100644 --- a/l10n/ru/lib.po +++ b/l10n/ru/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Приложения" msgid "Admin" msgstr "Admin" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "веб-сервисы под вашим управлением" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "ZIP-скачивание отключено." @@ -54,15 +64,21 @@ msgstr "ZIP-скачивание отключено." msgid "Files need to be downloaded one by one." msgstr "Файлы должны быть загружены по одному." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Назад к файлам" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Выбранные файлы слишком велики, чтобы создать zip файл." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "Невозможно установить" @@ -190,58 +206,62 @@ msgstr "Ваш веб сервер до сих пор не настроен пр msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "несколько секунд назад" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 минуту назад" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d минут назад" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "час назад" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d часов назад" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "сегодня" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "вчера" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d дней назад" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "в прошлом месяце" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d месяцев назад" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "в прошлом году" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "несколько лет назад" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po index ee2f5a76fa7..f6c17bac2d5 100644 --- a/l10n/si_LK/lib.po +++ b/l10n/si_LK/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "යෙදුම්" msgid "Admin" msgstr "පරිපාලක" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "ZIP භාගත කිරීම් අක්රියයි" @@ -53,15 +63,21 @@ msgstr "ZIP භාගත කිරීම් අක්රියයි" msgid "Files need to be downloaded one by one." msgstr "ගොනු එකින් එක භාගත යුතුයි" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "ගොනු වෙතට නැවත යන්න" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "තෝරාගත් ගොනු ZIP ගොනුවක් තැනීමට විශාල වැඩිය." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -189,58 +205,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "තත්පරයන්ට පෙර" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 මිනිත්තුවකට පෙර" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d මිනිත්තුවන්ට පෙර" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "අද" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "ඊයේ" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d දිනකට පෙර" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "පෙර මාසයේ" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "පෙර අවුරුද්දේ" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "අවුරුදු කීපයකට පෙර" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/sk/lib.po b/l10n/sk/lib.po index d1f1b336f10..9d5bd19be2d 100644 --- a/l10n/sk/lib.po +++ b/l10n/sk/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-05 02:13+0200\n" -"PO-Revision-Date: 2013-07-05 00:13+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n" "MIME-Version: 1.0\n" @@ -41,27 +41,43 @@ msgstr "" msgid "Admin" msgstr "" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "" -#: files.php:210 +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + +#: files.php:226 msgid "ZIP download is turned off." msgstr "" -#: files.php:211 +#: files.php:227 msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:212 files.php:245 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:242 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -170,77 +186,81 @@ msgstr "" msgid "PostgreSQL username and/or password not valid" msgstr "" -#: setup.php:42 +#: setup.php:28 msgid "Set an admin username." msgstr "" -#: setup.php:45 +#: setup.php:31 msgid "Set an admin password." msgstr "" -#: setup.php:198 +#: setup.php:184 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." msgstr "" -#: setup.php:199 +#: setup.php:185 #, php-format msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:113 +#: template/functions.php:80 msgid "seconds ago" msgstr "" -#: template.php:114 +#: template/functions.php:81 msgid "1 minute ago" msgstr "" -#: template.php:115 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:116 +#: template/functions.php:83 msgid "1 hour ago" msgstr "" -#: template.php:117 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:118 +#: template/functions.php:85 msgid "today" msgstr "" -#: template.php:119 +#: template/functions.php:86 msgid "yesterday" msgstr "" -#: template.php:120 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:121 +#: template/functions.php:88 msgid "last month" msgstr "" -#: template.php:122 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:123 +#: template/functions.php:90 msgid "last year" msgstr "" -#: template.php:124 +#: template/functions.php:91 msgid "years ago" msgstr "" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po index 722ff92de03..804de8e425c 100644 --- a/l10n/sk_SK/lib.po +++ b/l10n/sk_SK/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Aplikácie" msgid "Admin" msgstr "Administrátor" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "webové služby pod Vašou kontrolou" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Sťahovanie súborov ZIP je vypnuté." @@ -54,15 +64,21 @@ msgstr "Sťahovanie súborov ZIP je vypnuté." msgid "Files need to be downloaded one by one." msgstr "Súbory musia byť nahrávané jeden za druhým." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Späť na súbory" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Zvolené súbory sú príliš veľké na vygenerovanie zip súboru." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "nedá sa zistiť" @@ -190,58 +206,62 @@ msgstr "Váš webový server nie je správne nastavený na synchronizáciu, pret msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "pred sekundami" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "pred minútou" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "pred %d minútami" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "Pred 1 hodinou" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "Pred %d hodinami." -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "dnes" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "včera" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "pred %d dňami" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "minulý mesiac" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "Pred %d mesiacmi." -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "minulý rok" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "pred rokmi" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po index 08808a8af7c..1c5ae53da77 100644 --- a/l10n/sl/lib.po +++ b/l10n/sl/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Programi" msgid "Admin" msgstr "Skrbništvo" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "spletne storitve pod vašim nadzorom" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Prejemanje datotek v paketu ZIP je onemogočeno." @@ -54,15 +64,21 @@ msgstr "Prejemanje datotek v paketu ZIP je onemogočeno." msgid "Files need to be downloaded one by one." msgstr "Datoteke je mogoče prejeti le posamično." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Nazaj na datoteke" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "ni mogoče določiti" @@ -190,58 +206,62 @@ msgstr "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Preverite <a href='%s'>navodila namestitve</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "pred nekaj sekundami" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "pred minuto" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "pred %d minutami" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "Pred 1 uro" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "Pred %d urami" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "danes" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "včeraj" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "pred %d dnevi" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "zadnji mesec" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "Pred %d meseci" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "lansko leto" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "let nazaj" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po index 67a91dbe0bb..35759acbd8e 100644 --- a/l10n/sq/lib.po +++ b/l10n/sq/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "App" msgid "Admin" msgstr "Admin" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "shërbime web nën kontrollin tënd" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Shkarimi i skedarëve ZIP është i çaktivizuar." @@ -53,15 +63,21 @@ msgstr "Shkarimi i skedarëve ZIP është i çaktivizuar." msgid "Files need to be downloaded one by one." msgstr "Skedarët duhet të shkarkohen një nga një." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Kthehu tek skedarët" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Skedarët e selektuar janë shumë të mëdhenj për të krijuar një skedar ZIP." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "nuk u vendos dot" @@ -189,58 +205,62 @@ msgstr "Serveri web i juaji nuk është konfiguruar akoma për të lejuar sinkro msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "sekonda më parë" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 minutë më parë" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d minuta më parë" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 orë më parë" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d orë më parë" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "sot" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "dje" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d ditë më parë" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "muajin e shkuar" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d muaj më parë" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "vitin e shkuar" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "vite më parë" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po index b0fd929fad2..bd9dcab7ec7 100644 --- a/l10n/sr/lib.po +++ b/l10n/sr/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "Апликације" msgid "Admin" msgstr "Администратор" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "веб сервиси под контролом" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Преузимање ZIP-а је искључено." @@ -53,15 +63,21 @@ msgstr "Преузимање ZIP-а је искључено." msgid "Files need to be downloaded one by one." msgstr "Датотеке морате преузимати једну по једну." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Назад на датотеке" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Изабране датотеке су превелике да бисте направили ZIP датотеку." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "није одређено" @@ -189,58 +205,62 @@ msgstr "Ваш веб сервер тренутно не подржава син msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Погледајте <a href='%s'>водиче за инсталацију</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "пре неколико секунди" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "пре 1 минут" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "пре %d минута" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "Пре једног сата" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "пре %d сата/и" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "данас" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "јуче" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "пре %d дана" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "прошлог месеца" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "пре %d месеца/и" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "прошле године" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "година раније" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po index 13d4f6643e5..f2a53ab59e9 100644 --- a/l10n/sr@latin/lib.po +++ b/l10n/sr@latin/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "Programi" msgid "Admin" msgstr "Adninistracija" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "" @@ -53,15 +63,21 @@ msgstr "" msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -189,58 +205,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po index 3e637ac9076..4c06773ff19 100644 --- a/l10n/sv/lib.po +++ b/l10n/sv/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Program" msgid "Admin" msgstr "Admin" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "webbtjänster under din kontroll" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Nerladdning av ZIP är avstängd." @@ -54,15 +64,21 @@ msgstr "Nerladdning av ZIP är avstängd." msgid "Files need to be downloaded one by one." msgstr "Filer laddas ner en åt gången." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Tillbaka till Filer" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Valda filer är för stora för att skapa zip-fil." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "kunde inte bestämmas" @@ -190,58 +206,62 @@ msgstr "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkro msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Var god kontrollera <a href='%s'>installationsguiden</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "sekunder sedan" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 minut sedan" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d minuter sedan" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 timme sedan" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d timmar sedan" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "i dag" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "i går" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d dagar sedan" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "förra månaden" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d månader sedan" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "förra året" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "år sedan" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/sw_KE/lib.po b/l10n/sw_KE/lib.po index cf3d110e8eb..5f0afb54aba 100644 --- a/l10n/sw_KE/lib.po +++ b/l10n/sw_KE/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-05 02:13+0200\n" -"PO-Revision-Date: 2013-07-05 00:13+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n" "MIME-Version: 1.0\n" @@ -41,27 +41,43 @@ msgstr "" msgid "Admin" msgstr "" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "" -#: files.php:210 +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + +#: files.php:226 msgid "ZIP download is turned off." msgstr "" -#: files.php:211 +#: files.php:227 msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:212 files.php:245 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:242 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -170,77 +186,81 @@ msgstr "" msgid "PostgreSQL username and/or password not valid" msgstr "" -#: setup.php:42 +#: setup.php:28 msgid "Set an admin username." msgstr "" -#: setup.php:45 +#: setup.php:31 msgid "Set an admin password." msgstr "" -#: setup.php:198 +#: setup.php:184 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." msgstr "" -#: setup.php:199 +#: setup.php:185 #, php-format msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:113 +#: template/functions.php:80 msgid "seconds ago" msgstr "" -#: template.php:114 +#: template/functions.php:81 msgid "1 minute ago" msgstr "" -#: template.php:115 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:116 +#: template/functions.php:83 msgid "1 hour ago" msgstr "" -#: template.php:117 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:118 +#: template/functions.php:85 msgid "today" msgstr "" -#: template.php:119 +#: template/functions.php:86 msgid "yesterday" msgstr "" -#: template.php:120 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:121 +#: template/functions.php:88 msgid "last month" msgstr "" -#: template.php:122 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:123 +#: template/functions.php:90 msgid "last year" msgstr "" -#: template.php:124 +#: template/functions.php:91 msgid "years ago" msgstr "" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po index 65dcf5e617b..b4f5cc473a7 100644 --- a/l10n/ta_LK/lib.po +++ b/l10n/ta_LK/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "செயலிகள்" msgid "Admin" msgstr "நிர்வாகம்" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "வீசொலிப் பூட்டு பதிவிறக்கம் நிறுத்தப்பட்டுள்ளது." @@ -53,15 +63,21 @@ msgstr "வீசொலிப் பூட்டு பதிவிறக்க msgid "Files need to be downloaded one by one." msgstr "கோப்புகள்ஒன்றன் பின் ஒன்றாக பதிவிறக்கப்படவேண்டும்." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "கோப்புகளுக்கு செல்க" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "வீ சொலிக் கோப்புகளை உருவாக்குவதற்கு தெரிவுசெய்யப்பட்ட கோப்புகள் மிகப்பெரியவை" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -189,58 +205,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "செக்கன்களுக்கு முன்" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 நிமிடத்திற்கு முன் " -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d நிமிடங்களுக்கு முன்" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 மணித்தியாலத்திற்கு முன்" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d மணித்தியாலத்திற்கு முன்" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "இன்று" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "நேற்று" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d நாட்களுக்கு முன்" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "கடந்த மாதம்" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d மாதத்திற்கு முன்" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "கடந்த வருடம்" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "வருடங்களுக்கு முன்" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/te/lib.po b/l10n/te/lib.po index c1517bd4612..5cb1c2bfb6c 100644 --- a/l10n/te/lib.po +++ b/l10n/te/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-22 06:02+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "" msgid "Admin" msgstr "" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "" @@ -53,15 +63,21 @@ msgstr "" msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -189,58 +205,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "క్షణాల క్రితం" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 నిమిషం క్రితం" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 గంట క్రితం" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "ఈరోజు" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "నిన్న" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "పోయిన నెల" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "పోయిన సంవత్సరం" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "సంవత్సరాల క్రితం" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 40103df31a4..9d3e3ce4c9d 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\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" @@ -225,8 +225,8 @@ msgstr "" #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195 -#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:625 -#: js/share.js:637 +#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149 +#: js/share.js:631 js/share.js:643 msgid "Error" msgstr "" @@ -246,123 +246,123 @@ msgstr "" msgid "Share" msgstr "" -#: js/share.js:125 js/share.js:665 +#: js/share.js:131 js/share.js:671 msgid "Error while sharing" msgstr "" -#: js/share.js:136 +#: js/share.js:142 msgid "Error while unsharing" msgstr "" -#: js/share.js:143 +#: js/share.js:149 msgid "Error while changing permissions" msgstr "" -#: js/share.js:152 +#: js/share.js:158 msgid "Shared with you and the group {group} by {owner}" msgstr "" -#: js/share.js:154 +#: js/share.js:160 msgid "Shared with you by {owner}" msgstr "" -#: js/share.js:177 +#: js/share.js:183 msgid "Share with" msgstr "" -#: js/share.js:182 +#: js/share.js:188 msgid "Share with link" msgstr "" -#: js/share.js:185 +#: js/share.js:191 msgid "Password protect" msgstr "" -#: js/share.js:187 templates/installation.php:54 templates/login.php:26 +#: js/share.js:193 templates/installation.php:54 templates/login.php:26 msgid "Password" msgstr "" -#: js/share.js:192 +#: js/share.js:198 msgid "Allow Public Upload" msgstr "" -#: js/share.js:196 +#: js/share.js:202 msgid "Email link to person" msgstr "" -#: js/share.js:197 +#: js/share.js:203 msgid "Send" msgstr "" -#: js/share.js:202 +#: js/share.js:208 msgid "Set expiration date" msgstr "" -#: js/share.js:203 +#: js/share.js:209 msgid "Expiration date" msgstr "" -#: js/share.js:235 +#: js/share.js:241 msgid "Share via email:" msgstr "" -#: js/share.js:237 +#: js/share.js:243 msgid "No people found" msgstr "" -#: js/share.js:275 +#: js/share.js:281 msgid "Resharing is not allowed" msgstr "" -#: js/share.js:311 +#: js/share.js:317 msgid "Shared in {item} with {user}" msgstr "" -#: js/share.js:332 +#: js/share.js:338 msgid "Unshare" msgstr "" -#: js/share.js:344 +#: js/share.js:350 msgid "can edit" msgstr "" -#: js/share.js:346 +#: js/share.js:352 msgid "access control" msgstr "" -#: js/share.js:349 +#: js/share.js:355 msgid "create" msgstr "" -#: js/share.js:352 +#: js/share.js:358 msgid "update" msgstr "" -#: js/share.js:355 +#: js/share.js:361 msgid "delete" msgstr "" -#: js/share.js:358 +#: js/share.js:364 msgid "share" msgstr "" -#: js/share.js:392 js/share.js:612 +#: js/share.js:398 js/share.js:618 msgid "Password protected" msgstr "" -#: js/share.js:625 +#: js/share.js:631 msgid "Error unsetting expiration date" msgstr "" -#: js/share.js:637 +#: js/share.js:643 msgid "Error setting expiration date" msgstr "" -#: js/share.js:652 +#: js/share.js:658 msgid "Sending ..." msgstr "" -#: js/share.js:663 +#: js/share.js:669 msgid "Email sent" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 9a6b7799062..10e875b4aeb 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 953fb643767..11f4fd0ffb7 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\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 8783050a259..2ca2c53177c 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\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" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34 +#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39 msgid "Access granted" msgstr "" @@ -25,7 +25,7 @@ msgstr "" msgid "Error configuring Dropbox storage" msgstr "" -#: js/dropbox.js:65 js/google.js:66 +#: js/dropbox.js:65 js/google.js:86 msgid "Grant access" msgstr "" @@ -33,24 +33,24 @@ msgstr "" msgid "Please provide a valid Dropbox app key and secret." msgstr "" -#: js/google.js:36 js/google.js:93 +#: js/google.js:42 js/google.js:121 msgid "Error configuring Google Drive storage" msgstr "" -#: lib/config.php:447 +#: lib/config.php:448 msgid "" "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:450 +#: lib/config.php:451 msgid "" "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting " "of FTP shares is not possible. Please ask your system administrator to " "install it." msgstr "" -#: lib/config.php:453 +#: lib/config.php:454 msgid "" "<b>Warning:</b> The Curl support in PHP is not enabled or installed. " "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask " diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 684f57f5dfb..112dd50e748 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\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_trashbin.pot b/l10n/templates/files_trashbin.pot index 67b8845c28e..1390d6e3802 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\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 5f65e953444..6b1927af593 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\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 d916e620879..37e37e51237 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\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" @@ -41,10 +41,20 @@ msgstr "" msgid "Admin" msgstr "" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "" @@ -53,15 +63,21 @@ msgstr "" msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -189,58 +205,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 70d6df7d646..9e3f34d3989 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index d4d63901819..89c25881637 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index ac45363c3a5..f52eb6ca714 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\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/lib.po b/l10n/th_TH/lib.po index cd2e5593e3f..a12613c7221 100644 --- a/l10n/th_TH/lib.po +++ b/l10n/th_TH/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "แอปฯ" msgid "Admin" msgstr "ผู้ดูแล" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "คุณสมบัติการดาวน์โหลด zip ถูกปิดการใช้งานไว้" @@ -53,15 +63,21 @@ msgstr "คุณสมบัติการดาวน์โหลด zip ถ msgid "Files need to be downloaded one by one." msgstr "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "กลับไปที่ไฟล์" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "ไฟล์ที่เลือกมีขนาดใหญ่เกินกว่าที่จะสร้างเป็นไฟล์ zip" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "ไม่สามารถกำหนดได้" @@ -189,58 +205,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "วินาที ก่อนหน้านี้" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 นาทีก่อนหน้านี้" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d นาทีที่ผ่านมา" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 ชั่วโมงก่อนหน้านี้" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d ชั่วโมงก่อนหน้านี้" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "วันนี้" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "เมื่อวานนี้" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d วันที่ผ่านมา" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "เดือนที่แล้ว" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d เดือนมาแล้ว" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "ปีที่แล้ว" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "ปี ที่ผ่านมา" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po index 30b504d23b1..f87d09b3415 100644 --- a/l10n/tr/lib.po +++ b/l10n/tr/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "Uygulamalar" msgid "Admin" msgstr "Yönetici" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "Bilgileriniz güvenli ve şifreli" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "ZIP indirmeleri kapatılmıştır." @@ -54,15 +64,21 @@ msgstr "ZIP indirmeleri kapatılmıştır." msgid "Files need to be downloaded one by one." msgstr "Dosyaların birer birer indirilmesi gerekmektedir." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Dosyalara dön" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Seçilen dosyalar bir zip dosyası oluşturmak için fazla büyüktür." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "tespit edilemedi" @@ -190,58 +206,62 @@ msgstr "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırı msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Lütfen <a href='%s'>kurulum kılavuzlarını</a> iki kez kontrol edin." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "saniye önce" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 dakika önce" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d dakika önce" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 saat önce" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d saat önce" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "bugün" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "dün" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d gün önce" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "geçen ay" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d ay önce" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "geçen yıl" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "yıl önce" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po index fb0d253b770..bba5b72f53f 100644 --- a/l10n/ug/lib.po +++ b/l10n/ug/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Uighur <uqkun@outlook.com>\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "ئەپلەر" msgid "Admin" msgstr "" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "" @@ -53,15 +63,21 @@ msgstr "" msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -189,58 +205,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 مىنۇت ئىلگىرى" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d مىنۇت ئىلگىرى" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 سائەت ئىلگىرى" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d سائەت ئىلگىرى" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "بۈگۈن" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "تۈنۈگۈن" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d كۈن ئىلگىرى" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d ئاي ئىلگىرى" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po index 1dc92f71187..950fef2e264 100644 --- a/l10n/uk/lib.po +++ b/l10n/uk/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "Додатки" msgid "Admin" msgstr "Адмін" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "підконтрольні Вам веб-сервіси" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "ZIP завантаження вимкнено." @@ -53,15 +63,21 @@ msgstr "ZIP завантаження вимкнено." msgid "Files need to be downloaded one by one." msgstr "Файли повинні бути завантаженні послідовно." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Повернутися до файлів" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Вибрані фали завеликі для генерування zip файлу." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "не може бути визначено" @@ -189,58 +205,62 @@ msgstr "Ваш Web-сервер ще не налаштований належн msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "секунди тому" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 хвилину тому" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d хвилин тому" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 годину тому" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d годин тому" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "сьогодні" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "вчора" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d днів тому" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "минулого місяця" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d місяців тому" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "минулого року" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "роки тому" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/ur_PK/lib.po b/l10n/ur_PK/lib.po index 2304f1c052b..6c94b885fda 100644 --- a/l10n/ur_PK/lib.po +++ b/l10n/ur_PK/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-22 06:02+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "ایپز" msgid "Admin" msgstr "ایڈمن" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "آپ کے اختیار میں ویب سروسیز" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "" @@ -53,15 +63,21 @@ msgstr "" msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -189,58 +205,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po index cf5f630cf3b..83319251fa0 100644 --- a/l10n/vi/lib.po +++ b/l10n/vi/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "Ứng dụng" msgid "Admin" msgstr "Quản trị" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "dịch vụ web dưới sự kiểm soát của bạn" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "Tải về ZIP đã bị tắt." @@ -53,15 +63,21 @@ msgstr "Tải về ZIP đã bị tắt." msgid "Files need to be downloaded one by one." msgstr "Tập tin cần phải được tải về từng người một." -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "Trở lại tập tin" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "Tập tin được chọn quá lớn để tạo tập tin ZIP." -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "không thể phát hiện được" @@ -189,58 +205,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "vài giây trước" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 phút trước" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d phút trước" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 giờ trước" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d giờ trước" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "hôm nay" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "hôm qua" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d ngày trước" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "tháng trước" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d tháng trước" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "năm trước" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "năm trước" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/zh_CN.GB2312/lib.po index 77205cd45d5..63fdc2e17b5 100644 --- a/l10n/zh_CN.GB2312/lib.po +++ b/l10n/zh_CN.GB2312/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@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" @@ -41,10 +41,20 @@ msgstr "程序" msgid "Admin" msgstr "管理员" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "您控制的网络服务" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "ZIP 下载已关闭" @@ -53,15 +63,21 @@ msgstr "ZIP 下载已关闭" msgid "Files need to be downloaded one by one." msgstr "需要逐个下载文件。" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "返回到文件" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "选择的文件太大而不能生成 zip 文件。" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -189,58 +205,62 @@ msgstr "因WebDAV接口故障，您的网络服务器好像并未允许文件同 msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "请双击<a href='%s'>安装向导</a>。" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "秒前" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 分钟前" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d 分钟前" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1小时前" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "今天" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "昨天" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d 天前" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "上个月" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "去年" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "年前" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po index e7b55010f8d..35a0efd7f02 100644 --- a/l10n/zh_CN/lib.po +++ b/l10n/zh_CN/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "应用" msgid "Admin" msgstr "管理" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "您控制的web服务" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "ZIP 下载已经关闭" @@ -54,15 +64,21 @@ msgstr "ZIP 下载已经关闭" msgid "Files need to be downloaded one by one." msgstr "需要逐一下载文件" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "回到文件" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "选择的文件太大，无法生成 zip 文件。" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "无法确定" @@ -190,58 +206,62 @@ msgstr "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "请认真检查<a href='%s'>安装指南</a>." -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "秒前" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "一分钟前" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d 分钟前" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1小时前" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d小时前" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "今天" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "昨天" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d 天前" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "上月" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d 月前" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "去年" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "年前" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po index 584ef8503cc..e6c8651e5c8 100644 --- a/l10n/zh_HK/lib.po +++ b/l10n/zh_HK/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -41,10 +41,20 @@ msgstr "軟件" msgid "Admin" msgstr "管理" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "" @@ -53,15 +63,21 @@ msgstr "" msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "" @@ -189,58 +205,62 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "今日" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "昨日" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "前一月" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po index 514e60bbf79..813363fd041 100644 --- a/l10n/zh_TW/lib.po +++ b/l10n/zh_TW/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-23 01:55-0400\n" -"PO-Revision-Date: 2013-07-23 05:05+0000\n" +"POT-Creation-Date: 2013-07-24 01:55-0400\n" +"PO-Revision-Date: 2013-07-24 05:55+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -42,10 +42,20 @@ msgstr "應用程式" msgid "Admin" msgstr "管理" +#: app.php:844 +#, php-format +msgid "Failed to upgrade \"%s\"." +msgstr "" + #: defaults.php:33 msgid "web services under your control" msgstr "由您控制的網路服務" +#: files.php:66 files.php:98 +#, php-format +msgid "cannot open \"%s\"" +msgstr "" + #: files.php:226 msgid "ZIP download is turned off." msgstr "ZIP 下載已關閉。" @@ -54,15 +64,21 @@ msgstr "ZIP 下載已關閉。" msgid "Files need to be downloaded one by one." msgstr "檔案需要逐一下載。" -#: files.php:228 files.php:261 +#: files.php:228 files.php:256 msgid "Back to Files" msgstr "回到檔案列表" -#: files.php:258 +#: files.php:253 msgid "Selected files too large to generate zip file." msgstr "選擇的檔案太大以致於無法產生壓縮檔。" -#: helper.php:236 +#: files.php:254 +msgid "" +"Download the files in smaller chunks, seperately or kindly ask your " +"administrator." +msgstr "" + +#: helper.php:235 msgid "couldn't be determined" msgstr "無法判斷" @@ -190,58 +206,62 @@ msgstr "您的網頁伺服器尚未被正確設定來進行檔案同步，因為 msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "請參考<a href='%s'>安裝指南</a>。" -#: template.php:95 +#: template/functions.php:80 msgid "seconds ago" msgstr "幾秒前" -#: template.php:96 +#: template/functions.php:81 msgid "1 minute ago" msgstr "1 分鐘前" -#: template.php:97 +#: template/functions.php:82 #, php-format msgid "%d minutes ago" msgstr "%d 分鐘前" -#: template.php:98 +#: template/functions.php:83 msgid "1 hour ago" msgstr "1 小時之前" -#: template.php:99 +#: template/functions.php:84 #, php-format msgid "%d hours ago" msgstr "%d 小時之前" -#: template.php:100 +#: template/functions.php:85 msgid "today" msgstr "今天" -#: template.php:101 +#: template/functions.php:86 msgid "yesterday" msgstr "昨天" -#: template.php:102 +#: template/functions.php:87 #, php-format msgid "%d days ago" msgstr "%d 天前" -#: template.php:103 +#: template/functions.php:88 msgid "last month" msgstr "上個月" -#: template.php:104 +#: template/functions.php:89 #, php-format msgid "%d months ago" msgstr "%d 個月之前" -#: template.php:105 +#: template/functions.php:90 msgid "last year" msgstr "去年" -#: template.php:106 +#: template/functions.php:91 msgid "years ago" msgstr "幾年前" +#: template.php:296 +msgid "Caused by:" +msgstr "" + #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" diff --git a/lib/base.php b/lib/base.php index df57fe979f3..eaee8424651 100644 --- a/lib/base.php +++ b/lib/base.php @@ -173,7 +173,7 @@ class OC { and !is_writable(OC::$SERVERROOT . "/config/config.php")) { $defaults = new OC_Defaults(); OC_Template::printErrorPage( - "Can't write into config directory 'config'", + "Can't write into config directory!", 'This can usually be fixed by ' .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the config directory</a>.' ); @@ -826,3 +826,4 @@ if (!function_exists('get_temp_dir')) { } OC::init(); + diff --git a/lib/config.php b/lib/config.php index a38ce19c74f..e773e6e2eb0 100644 --- a/lib/config.php +++ b/lib/config.php @@ -144,11 +144,8 @@ class Config { continue; } unset($CONFIG); - if((@include $file) === false) - { - throw new HintException("Can't read from config file '" . $file . "'. ". - 'This is usually caused by the wrong file permission.'); - } + // ignore errors on include, this can happen when doing a fresh install + @include $file; if (isset($CONFIG) && is_array($CONFIG)) { $this->cache = array_merge($this->cache, $CONFIG); } @@ -177,7 +174,7 @@ class Config { if (!$result) { $url = $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions'; throw new HintException( - "Can't write into config directory 'config'", + "Can't write into config directory!", 'This can usually be fixed by ' .'<a href="' . $url . '" target="_blank">giving the webserver write access to the config directory</a>.'); } @@ -186,3 +183,4 @@ class Config { \OC_Util::clearOpcodeCache(); } } + diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php index 3d15a2a584d..ed8d085462d 100644 --- a/lib/connector/sabre/directory.php +++ b/lib/connector/sabre/directory.php @@ -222,7 +222,6 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa throw new \Sabre_DAV_Exception_Forbidden(); } if ($this->path != "/Shared") { - foreach($this->getChildren() as $child) $child->delete(); \OC\Files\Filesystem::rmdir($this->path); } diff --git a/lib/connector/sabre/objecttree.php b/lib/connector/sabre/objecttree.php new file mode 100644 index 00000000000..c4ddcbecbb8 --- /dev/null +++ b/lib/connector/sabre/objecttree.php @@ -0,0 +1,102 @@ +<?php +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Connector\Sabre; + +use OC\Files\Filesystem; + +class ObjectTree extends \Sabre_DAV_ObjectTree { + /** + * Returns the INode object for the requested path + * + * @param string $path + * @throws \Sabre_DAV_Exception_NotFound + * @return \Sabre_DAV_INode + */ + public function getNodeForPath($path) { + + $path = trim($path, '/'); + if (isset($this->cache[$path])) return $this->cache[$path]; + + // Is it the root node? + if (!strlen($path)) { + return $this->rootNode; + } + + $info = Filesystem::getFileInfo($path); + + if (!$info) { + throw new \Sabre_DAV_Exception_NotFound('File with name ' . $path . ' could not be located'); + } + + if ($info['mimetype'] === 'httpd/unix-directory') { + $node = new \OC_Connector_Sabre_Directory($path); + } else { + $node = new \OC_Connector_Sabre_File($path); + } + + $node->setFileinfoCache($info); + + $this->cache[$path] = $node; + return $node; + + } + + /** + * Moves a file from one location to another + * + * @param string $sourcePath The path to the file which should be moved + * @param string $destinationPath The full destination path, so not just the destination parent node + * @throws \Sabre_DAV_Exception_Forbidden + * @return int + */ + public function move($sourcePath, $destinationPath) { + + $sourceNode = $this->getNodeForPath($sourcePath); + if ($sourceNode instanceof \Sabre_DAV_ICollection and $this->nodeExists($destinationPath)) { + throw new \Sabre_DAV_Exception_Forbidden('Could not copy directory ' . $sourceNode . ', target exists'); + } + list($sourceDir,) = \Sabre_DAV_URLUtil::splitPath($sourcePath); + list($destinationDir,) = \Sabre_DAV_URLUtil::splitPath($destinationPath); + + Filesystem::rename($sourcePath, $destinationPath); + + $this->markDirty($sourceDir); + $this->markDirty($destinationDir); + + } + + /** + * Copies a file or directory. + * + * This method must work recursively and delete the destination + * if it exists + * + * @param string $source + * @param string $destination + * @return void + */ + public function copy($source, $destination) { + + if (Filesystem::is_file($source)) { + Filesystem::copy($source, $destination); + } else { + Filesystem::mkdir($destination); + $dh = Filesystem::opendir($source); + while ($subnode = readdir($dh)) { + + if ($subnode == '.' || $subnode == '..') continue; + $this->copy($source . '/' . $subnode, $destination . '/' . $subnode); + + } + } + + list($destinationDir,) = \Sabre_DAV_URLUtil::splitPath($destination); + $this->markDirty($destinationDir); + } +} diff --git a/lib/defaults.php b/lib/defaults.php index 196bb5cf14d..10813a3e8d8 100644 --- a/lib/defaults.php +++ b/lib/defaults.php @@ -16,6 +16,7 @@ class OC_Defaults { private $defaultEntity; private $defaultName; + private $defaultTitle; private $defaultBaseUrl; private $defaultSyncClientUrl; private $defaultDocBaseUrl; @@ -25,8 +26,9 @@ class OC_Defaults { function __construct() { $l = OC_L10N::get('core'); - $this->defaultEntity = "ownCloud"; - $this->defaultName = "ownCloud"; + $this->defaultEntity = "ownCloud"; /* e.g. company name, used for footers and copyright notices */ + $this->defaultName = "ownCloud"; /* short name, used when referring to the software */ + $this->defaultTitle = "ownCloud"; /* can be a longer name, for titles */ $this->defaultBaseUrl = "http://owncloud.org"; $this->defaultSyncClientUrl = " http://owncloud.org/sync-clients/"; $this->defaultDocBaseUrl = "http://doc.owncloud.org"; @@ -69,6 +71,14 @@ class OC_Defaults { } } + public function getTitle() { + if ($this->themeExist('getTitle')) { + return $this->theme->getTitle(); + } else { + return $this->defaultTitle; + } + } + public function getName() { if ($this->themeExist('getName')) { return $this->theme->getName(); diff --git a/lib/group.php b/lib/group.php index d1a830730b7..8fbf5f86418 100644 --- a/lib/group.php +++ b/lib/group.php @@ -34,28 +34,43 @@ * post_removeFromGroup(uid, gid) */ class OC_Group { - // The backend used for group management /** - * @var OC_Group_Interface[] + * @var \OC\Group\Manager $manager */ - private static $_usedBackends = array(); + private static $manager; + + /** + * @var \OC\User\Manager + */ + private static $userManager; + + /** + * @return \OC\Group\Manager + */ + public static function getManager() { + if (self::$manager) { + return self::$manager; + } + self::$userManager = \OC_User::getManager(); + self::$manager = new \OC\Group\Manager(self::$userManager); + return self::$manager; + } /** * @brief set the group backend - * @param string $backend The backend to use for user managment + * @param \OC_Group_Backend $backend The backend to use for user managment * @return bool */ - public static function useBackend( $backend ) { - if($backend instanceof OC_Group_Interface) { - self::$_usedBackends[]=$backend; - } + public static function useBackend($backend) { + self::getManager()->addBackend($backend); + return true; } /** * remove all used backends */ public static function clearBackends() { - self::$_usedBackends=array(); + self::getManager()->clearBackends(); } /** @@ -66,32 +81,13 @@ class OC_Group { * Tries to create a new group. If the group name already exists, false will * be returned. Basic checking of Group name */ - public static function createGroup( $gid ) { - // No empty group names! - if( !$gid ) { - return false; - } - // No duplicate group names - if( in_array( $gid, self::getGroups())) { - return false; - } - - $run = true; - OC_Hook::emit( "OC_Group", "pre_createGroup", array( "run" => &$run, "gid" => $gid )); - - if($run) { - //create the group in the first backend that supports creating groups - foreach(self::$_usedBackends as $backend) { - if(!$backend->implementsActions(OC_GROUP_BACKEND_CREATE_GROUP)) - continue; + public static function createGroup($gid) { + OC_Hook::emit("OC_Group", "pre_createGroup", array("run" => true, "gid" => $gid)); - $backend->createGroup($gid); - OC_Hook::emit( "OC_User", "post_createGroup", array( "gid" => $gid )); - - return true; - } - return false; - }else{ + if (self::getManager()->createGroup($gid)) { + OC_Hook::emit("OC_User", "post_createGroup", array("gid" => $gid)); + return true; + } else { return false; } } @@ -103,30 +99,22 @@ class OC_Group { * * Deletes a group and removes it from the group_user-table */ - public static function deleteGroup( $gid ) { + public static function deleteGroup($gid) { // Prevent users from deleting group admin - if( $gid == "admin" ) { + if ($gid == "admin") { return false; } - $run = true; - OC_Hook::emit( "OC_Group", "pre_deleteGroup", array( "run" => &$run, "gid" => $gid )); - - if($run) { - //delete the group from all backends - foreach(self::$_usedBackends as $backend) { - if(!$backend->implementsActions(OC_GROUP_BACKEND_DELETE_GROUP)) - continue; - - $backend->deleteGroup($gid); - OC_Hook::emit( "OC_User", "post_deleteGroup", array( "gid" => $gid )); + OC_Hook::emit("OC_Group", "pre_deleteGroup", array("run" => true, "gid" => $gid)); + $group = self::getManager()->get($gid); + if ($group) { + if ($group->delete()) { + OC_Hook::emit("OC_User", "post_deleteGroup", array("gid" => $gid)); return true; } - return false; - }else{ - return false; } + return false; } /** @@ -137,11 +125,11 @@ class OC_Group { * * Checks whether the user is member of a group or not. */ - public static function inGroup( $uid, $gid ) { - foreach(self::$_usedBackends as $backend) { - if($backend->inGroup($uid, $gid)) { - return true; - } + public static function inGroup($uid, $gid) { + $group = self::getManager()->get($gid); + $user = self::$userManager->get($uid); + if ($group and $user) { + return $group->inGroup($user); } return false; } @@ -154,33 +142,15 @@ class OC_Group { * * Adds a user to a group. */ - public static function addToGroup( $uid, $gid ) { - // Does the group exist? - if( !OC_Group::groupExists($gid)) { - return false; - } - - // Go go go - $run = true; - OC_Hook::emit( "OC_Group", "pre_addToGroup", array( "run" => &$run, "uid" => $uid, "gid" => $gid )); - - if($run) { - $success=false; - - //add the user to the all backends that have the group - foreach(self::$_usedBackends as $backend) { - if(!$backend->implementsActions(OC_GROUP_BACKEND_ADD_TO_GROUP)) - continue; - - if($backend->groupExists($gid)) { - $success|=$backend->addToGroup($uid, $gid); - } - } - if($success) { - OC_Hook::emit( "OC_User", "post_addToGroup", array( "uid" => $uid, "gid" => $gid )); - } - return $success; - }else{ + public static function addToGroup($uid, $gid) { + $group = self::getManager()->get($gid); + $user = self::$userManager->get($uid); + if ($group and $user) { + OC_Hook::emit("OC_Group", "pre_addToGroup", array("run" => true, "uid" => $uid, "gid" => $gid)); + $group->addUser($user); + OC_Hook::emit("OC_User", "post_addToGroup", array("uid" => $uid, "gid" => $gid)); + return true; + } else { return false; } } @@ -193,21 +163,15 @@ class OC_Group { * * removes the user from a group. */ - public static function removeFromGroup( $uid, $gid ) { - $run = true; - OC_Hook::emit( "OC_Group", "pre_removeFromGroup", array( "run" => &$run, "uid" => $uid, "gid" => $gid )); - - if($run) { - //remove the user from the all backends that have the group - foreach(self::$_usedBackends as $backend) { - if(!$backend->implementsActions(OC_GROUP_BACKEND_REMOVE_FROM_GOUP)) - continue; - - $backend->removeFromGroup($uid, $gid); - OC_Hook::emit( "OC_User", "post_removeFromGroup", array( "uid" => $uid, "gid" => $gid )); - } + public static function removeFromGroup($uid, $gid) { + $group = self::getManager()->get($gid); + $user = self::$userManager->get($uid); + if ($group and $user) { + OC_Hook::emit("OC_Group", "pre_removeFromGroup", array("run" => true, "uid" => $uid, "gid" => $gid)); + $group->removeUser($user); + OC_Hook::emit("OC_User", "post_removeFromGroup", array("uid" => $uid, "gid" => $gid)); return true; - }else{ + } else { return false; } } @@ -220,13 +184,18 @@ class OC_Group { * This function fetches all groups a user belongs to. It does not check * if the user exists at all. */ - public static function getUserGroups( $uid ) { - $groups=array(); - foreach(self::$_usedBackends as $backend) { - $groups=array_merge($backend->getUserGroups($uid), $groups); + public static function getUserGroups($uid) { + $user = self::$userManager->get($uid); + if ($user) { + $groups = self::getManager()->getUserGroups($user); + $groupIds = array(); + foreach ($groups as $group) { + $groupIds[] = $group->getGID(); + } + return $groupIds; + } else { + return array(); } - asort($groups); - return $groups; } /** @@ -235,27 +204,23 @@ class OC_Group { * * Returns a list with all groups */ - public static function getGroups($search = '', $limit = -1, $offset = 0) { - $groups = array(); - foreach (self::$_usedBackends as $backend) { - $groups = array_merge($backend->getGroups($search, $limit, $offset), $groups); + public static function getGroups($search = '', $limit = null, $offset = null) { + $groups = self::getManager()->search($search, $limit, $offset); + $groupIds = array(); + foreach ($groups as $group) { + $groupIds[] = $group->getGID(); } - asort($groups); - return $groups; + return $groupIds; } /** * check if a group exists + * * @param string $gid * @return bool */ public static function groupExists($gid) { - foreach(self::$_usedBackends as $backend) { - if ($backend->groupExists($gid)) { - return true; - } - } - return false; + return self::getManager()->groupExists($gid); } /** @@ -263,11 +228,17 @@ class OC_Group { * @returns array with user ids */ public static function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) { - $users=array(); - foreach(self::$_usedBackends as $backend) { - $users = array_merge($backend->usersInGroup($gid, $search, $limit, $offset), $users); + $group = self::getManager()->get($gid); + if ($group) { + $users = $group->searchUsers($search . $limit, $offset); + $userIds = array(); + foreach ($users as $user) { + $userIds[] = $user->getUID(); + } + return $userIds; + } else { + return array(); } - return $users; } /** @@ -292,17 +263,17 @@ class OC_Group { * @returns array with display names (value) and user ids(key) */ public static function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { - $displayNames=array(); - foreach(self::$_usedBackends as $backend) { - if($backend->implementsActions(OC_GROUP_BACKEND_GET_DISPLAYNAME)) { - $displayNames = array_merge($backend->displayNamesInGroup($gid, $search, $limit, $offset), $displayNames); - } else { - $users = $backend->usersInGroup($gid, $search, $limit, $offset); - $names = array_combine($users, $users); - $displayNames = array_merge($names, $displayNames); + $group = self::getManager()->get($gid); + if ($group) { + $users = $group->searchDisplayName($search . $limit, $offset); + $displayNames = array(); + foreach ($users as $user) { + $displayNames[] = $user->getDisplayName(); } + return $displayNames; + } else { + return array(); } - return $displayNames; } /** diff --git a/lib/group/group.php b/lib/group/group.php new file mode 100644 index 00000000000..a752c4311c1 --- /dev/null +++ b/lib/group/group.php @@ -0,0 +1,238 @@ +<?php + +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Group; + +class Group { + /** + * @var string $id + */ + private $gid; + + /** + * @var \OC\User\User[] $users + */ + private $users; + + /** + * @var \OC_Group_Backend[] | \OC_Group_Database[] $backend + */ + private $backends; + + /** + * @var \OC\Hooks\PublicEmitter $emitter; + */ + private $emitter; + + /** + * @var \OC\User\Manager $userManager + */ + private $userManager; + + /** + * @param string $gid + * @param \OC_Group_Backend[] $backends + * @param \OC\User\Manager $userManager + * @param \OC\Hooks\PublicEmitter $emitter + */ + public function __construct($gid, $backends, $userManager, $emitter = null) { + $this->gid = $gid; + $this->backends = $backends; + $this->userManager = $userManager; + $this->emitter = $emitter; + } + + public function getGID() { + return $this->gid; + } + + /** + * get all users in the group + * + * @return \OC\User\User[] + */ + public function getUsers() { + if ($this->users) { + return $this->users; + } + + $users = array(); + $userIds = array(); + foreach ($this->backends as $backend) { + $diff = array_diff( + $backend->usersInGroup($this->gid), + $userIds + ); + if ($diff) { + $userIds = array_merge($userIds, $diff); + } + } + + foreach ($userIds as $userId) { + $users[] = $this->userManager->get($userId); + } + $this->users = $users; + return $users; + } + + /** + * check if a user is in the group + * + * @param \OC\User\User $user + * @return bool + */ + public function inGroup($user) { + foreach ($this->backends as $backend) { + if ($backend->inGroup($user->getUID(), $this->gid)) { + return true; + } + } + return false; + } + + /** + * add a user to the group + * + * @param \OC\User\User $user + */ + public function addUser($user) { + if ($this->inGroup($user)) { + return; + } + + if ($this->emitter) { + $this->emitter->emit('\OC\Group', 'preAddUser', array($this, $user)); + } + foreach ($this->backends as $backend) { + if ($backend->implementsActions(OC_GROUP_BACKEND_ADD_TO_GROUP)) { + $backend->addToGroup($user->getUID(), $this->gid); + if ($this->users) { + $this->users[] = $user; + } + if ($this->emitter) { + $this->emitter->emit('\OC\Group', 'postAddUser', array($this, $user)); + } + return; + } + } + } + + /** + * remove a user from the group + * + * @param \OC\User\User $user + */ + public function removeUser($user) { + $result = false; + if ($this->emitter) { + $this->emitter->emit('\OC\Group', 'preRemoveUser', array($this, $user)); + } + foreach ($this->backends as $backend) { + if ($backend->implementsActions(OC_GROUP_BACKEND_REMOVE_FROM_GOUP) and $backend->inGroup($user->getUID(), $this->gid)) { + $backend->removeFromGroup($user->getUID(), $this->gid); + $result = true; + } + } + if ($result) { + if ($this->emitter) { + $this->emitter->emit('\OC\Group', 'postRemoveUser', array($this, $user)); + } + if ($this->users) { + foreach ($this->users as $index => $groupUser) { + if ($groupUser->getUID() === $user->getUID()) { + unset($this->users[$index]); + return; + } + } + } + } + } + + /** + * search for users in the group by userid + * + * @param string $search + * @param int $limit + * @param int $offset + * @return \OC\User\User[] + */ + public function searchUsers($search, $limit = null, $offset = null) { + $users = array(); + foreach ($this->backends as $backend) { + $userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset); + if (!is_null($limit)) { + $limit -= count($userIds); + } + if (!is_null($offset)) { + $offset -= count($userIds); + } + foreach ($userIds as $userId) { + $users[$userId] = $this->userManager->get($userId); + } + if (!is_null($limit) and $limit <= 0) { + return array_values($users); + } + } + return array_values($users); + } + + /** + * search for users in the group by displayname + * + * @param string $search + * @param int $limit + * @param int $offset + * @return \OC\User\User[] + */ + public function searchDisplayName($search, $limit = null, $offset = null) { + $users = array(); + foreach ($this->backends as $backend) { + if ($backend->implementsActions(OC_GROUP_BACKEND_GET_DISPLAYNAME)) { + $userIds = array_keys($backend->displayNamesInGroup($this->gid, $search, $limit, $offset)); + } else { + $userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset); + } + if (!is_null($limit)) { + $limit -= count($userIds); + } + if (!is_null($offset)) { + $offset -= count($userIds); + } + foreach ($userIds as $userId) { + $users[$userId] = $this->userManager->get($userId); + } + if (!is_null($limit) and $limit <= 0) { + return array_values($users); + } + } + return array_values($users); + } + + /** + * delete the group + * + * @return bool + */ + public function delete() { + $result = false; + if ($this->emitter) { + $this->emitter->emit('\OC\Group', 'preDelete', array($this)); + } + foreach ($this->backends as $backend) { + if ($backend->implementsActions(OC_GROUP_BACKEND_DELETE_GROUP)) { + $result = true; + $backend->deleteGroup($this->gid); + } + } + if ($result and $this->emitter) { + $this->emitter->emit('\OC\Group', 'postDelete', array($this)); + } + return $result; + } +} diff --git a/lib/group/manager.php b/lib/group/manager.php new file mode 100644 index 00000000000..bf469d51d12 --- /dev/null +++ b/lib/group/manager.php @@ -0,0 +1,169 @@ +<?php + +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Group; + +use OC\Hooks\PublicEmitter; + +/** + * Class Manager + * + * Hooks available in scope \OC\Group: + * - preAddUser(\OC\Group\Group $group, \OC\User\User $user) + * - postAddUser(\OC\Group\Group $group, \OC\User\User $user) + * - preRemoveUser(\OC\Group\Group $group, \OC\User\User $user) + * - postRemoveUser(\OC\Group\Group $group, \OC\User\User $user) + * - preDelete(\OC\Group\Group $group) + * - postDelete(\OC\Group\Group $group) + * - preCreate(string $groupId) + * - postCreate(\OC\Group\Group $group) + * + * @package OC\Group + */ +class Manager extends PublicEmitter { + /** + * @var \OC_Group_Backend[] | \OC_Group_Database[] $backends + */ + private $backends = array(); + + /** + * @var \OC\User\Manager $userManager + */ + private $userManager; + + /** + * @var \OC\Group\Group[] + */ + private $cachedGroups; + + /** + * @param \OC\User\Manager $userManager + */ + public function __construct($userManager) { + $this->userManager = $userManager; + $cache = & $this->cachedGroups; + $this->listen('\OC\Group', 'postDelete', function ($group) use (&$cache) { + /** + * @var \OC\Group\Group $group + */ + unset($cache[$group->getGID()]); + }); + } + + /** + * @param \OC_Group_Backend $backend + */ + public function addBackend($backend) { + $this->backends[] = $backend; + } + + public function clearBackends() { + $this->backends = array(); + $this->cachedGroups = array(); + } + + /** + * @param string $gid + * @return \OC\Group\Group + */ + public function get($gid) { + if (isset($this->cachedGroups[$gid])) { + return $this->cachedGroups[$gid]; + } + foreach ($this->backends as $backend) { + if ($backend->groupExists($gid)) { + return $this->getGroupObject($gid); + } + } + return null; + } + + protected function getGroupObject($gid) { + $backends = array(); + foreach ($this->backends as $backend) { + if ($backend->groupExists($gid)) { + $backends[] = $backend; + } + } + $this->cachedGroups[$gid] = new Group($gid, $backends, $this->userManager, $this); + return $this->cachedGroups[$gid]; + } + + /** + * @param string $gid + * @return bool + */ + public function groupExists($gid) { + return !is_null($this->get($gid)); + } + + /** + * @param string $gid + * @return \OC\Group\Group + */ + public function createGroup($gid) { + if (!$gid) { + return false; + } else if ($this->groupExists($gid)) { + return $this->get($gid); + } else { + $this->emit('\OC\Group', 'preCreate', array($gid)); + foreach ($this->backends as $backend) { + if ($backend->implementsActions(OC_GROUP_BACKEND_CREATE_GROUP)) { + $backend->createGroup($gid); + $group = $this->getGroupObject($gid); + $this->emit('\OC\Group', 'postCreate', array($group)); + return $group; + } + } + return null; + } + } + + /** + * @param string $search + * @param int $limit + * @param int $offset + * @return \OC\Group\Group[] + */ + public function search($search, $limit = null, $offset = null) { + $groups = array(); + foreach ($this->backends as $backend) { + $groupIds = $backend->getGroups($search, $limit, $offset); + if (!is_null($limit)) { + $limit -= count($groupIds); + } + if (!is_null($offset)) { + $offset -= count($groupIds); + } + foreach ($groupIds as $groupId) { + $groups[$groupId] = $this->getGroupObject($groupId); + } + if (!is_null($limit) and $limit <= 0) { + return array_values($groups); + } + } + return array_values($groups); + } + + /** + * @param \OC\User\User $user + * @return \OC\Group\Group[] + */ + public function getUserGroups($user) { + $groups = array(); + foreach ($this->backends as $backend) { + $groupIds = $backend->getUserGroups($user->getUID()); + foreach ($groupIds as $groupId) { + $groups[$groupId] = $this->getGroupObject($groupId); + } + } + return array_values($groups); + } +} diff --git a/lib/memcache/apcu.php b/lib/memcache/apcu.php new file mode 100644 index 00000000000..ccc1aa6e562 --- /dev/null +++ b/lib/memcache/apcu.php @@ -0,0 +1,28 @@ +<?php +/** + * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Memcache; + +class APCu extends APC { + public function clear($prefix = '') { + $ns = $this->getNamespace() . $prefix; + $ns = preg_quote($ns, '/'); + $iter = new \APCIterator('/^'.$ns.'/'); + return apc_delete($iter); + } + + static public function isAvailable() { + if (!extension_loaded('apcu')) { + return false; + } elseif (!ini_get('apc.enable_cli') && \OC::$CLI) { + return false; + } else { + return true; + } + } +} diff --git a/lib/memcache/factory.php b/lib/memcache/factory.php index b1b49971031..4c1b1ab207f 100644 --- a/lib/memcache/factory.php +++ b/lib/memcache/factory.php @@ -18,6 +18,8 @@ class Factory { function create($prefix = '') { if (XCache::isAvailable()) { return new XCache($prefix); + } elseif (APCu::isAvailable()) { + return new APCu($prefix); } elseif (APC::isAvailable()) { return new APC($prefix); } elseif (Memcached::isAvailable()) { @@ -33,6 +35,6 @@ class Factory { * @return bool */ public function isAvailable() { - return XCache::isAvailable() || APC::isAvailable() || Memcached::isAvailable(); + return XCache::isAvailable() || APCu::isAvailable() || APC::isAvailable() || Memcached::isAvailable(); } } diff --git a/lib/public/files.php b/lib/public/files.php index 4975bbb7dfa..852b041eefb 100644 --- a/lib/public/files.php +++ b/lib/public/files.php @@ -61,7 +61,7 @@ class Files { * @param string $query * @return array */ - public function searchByMime($mimetype) { + static public function searchByMime($mimetype) { return(\OC\Files\Filesystem::searchByMime( $mimetype )); } diff --git a/lib/template.php b/lib/template.php index d17be753db8..9b2c1211e61 100644 --- a/lib/template.php +++ b/lib/template.php @@ -55,6 +55,7 @@ class OC_Template extends \OC\Template\Base { $parts = explode('/', $app); // fix translation when app is something like core/lostpassword $l10n = OC_L10N::get($parts[0]); + $themeDefaults = new OC_Defaults(); list($path, $template) = $this->findTemplate($theme, $app, $name, $fext); @@ -62,7 +63,7 @@ class OC_Template extends \OC\Template\Base { $this->renderas = $renderas; $this->path = $path; - parent::__construct($template, $requesttoken, $l10n); + parent::__construct($template, $requesttoken, $l10n, $themeDefaults); // Some headers to enhance security header('X-XSS-Protection: 1; mode=block'); // Enforce browser based XSS filters diff --git a/lib/template/base.php b/lib/template/base.php index c7ddaa2e8e1..88941bc7132 100644 --- a/lib/template/base.php +++ b/lib/template/base.php @@ -12,12 +12,14 @@ class Base { private $template; // The template private $vars; // Vars private $l10n; // The l10n-Object + private $theme; // theme defaults - public function __construct( $template, $requesttoken, $l10n ) { + public function __construct( $template, $requesttoken, $l10n, $theme ) { $this->vars = array(); $this->vars['requesttoken'] = $requesttoken; $this->l10n = $l10n; $this->template = $template; + $this->theme = $theme; } protected function getAppTemplateDirs($theme, $app, $serverroot, $app_dir) { @@ -113,6 +115,7 @@ class Base { // Register the variables $_ = $this->vars; $l = $this->l10n; + $theme = $this->theme; if( !is_null($additionalparams)) { $_ = array_merge( $additionalparams, $this->vars ); diff --git a/lib/user.php b/lib/user.php index d93ab1a5f73..ee20f2e0971 100644 --- a/lib/user.php +++ b/lib/user.php @@ -39,7 +39,7 @@ class OC_User { public static $userSession = null; - private static function getUserSession() { + public static function getUserSession() { if (!self::$userSession) { $manager = new \OC\User\Manager(); self::$userSession = new \OC\User\Session($manager, \OC::$session); @@ -83,7 +83,7 @@ class OC_User { /** * @return \OC\User\Manager */ - private static function getManager() { + public static function getManager() { return self::getUserSession()->getManager(); } diff --git a/lib/user/manager.php b/lib/user/manager.php index d17cdf1a200..8dc9bfe2729 100644 --- a/lib/user/manager.php +++ b/lib/user/manager.php @@ -30,6 +30,9 @@ class Manager extends PublicEmitter { */ private $backends = array(); + /** + * @var \OC\User\User[] $cachedUsers + */ private $cachedUsers = array(); public function __construct() { diff --git a/lib/user/user.php b/lib/user/user.php index 55d7848a979..8115c43198c 100644 --- a/lib/user/user.php +++ b/lib/user/user.php @@ -44,7 +44,7 @@ class User { */ public function __construct($uid, $backend, $emitter = null) { $this->uid = $uid; - if ($backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) { + if ($backend and $backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) { $this->displayName = $backend->getDisplayName($uid); } else { $this->displayName = $uid; diff --git a/settings/l10n/de.php b/settings/l10n/de.php index d1b5ceb888a..b32790f26e0 100644 --- a/settings/l10n/de.php +++ b/settings/l10n/de.php @@ -56,6 +56,8 @@ "Allow apps to use the Share API" => "Erlaubt Apps die Nutzung der Share-API", "Allow links" => "Erlaubt Links", "Allow users to share items to the public with links" => "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen", +"Allow public uploads" => "Öffentliches Hochladen erlauben", +"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen", "Allow resharing" => "Erlaubt erneutes Teilen", "Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen", "Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen", diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php index ff71cbdd0fa..07003169c3f 100644 --- a/settings/l10n/de_DE.php +++ b/settings/l10n/de_DE.php @@ -56,6 +56,8 @@ "Allow apps to use the Share API" => "Anwendungen erlauben, die Share-API zu benutzen", "Allow links" => "Links erlauben", "Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen", +"Allow public uploads" => "Erlaube öffentliches hochladen", +"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen", "Allow resharing" => "Erlaube Weiterverteilen", "Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen", "Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen", diff --git a/settings/l10n/el.php b/settings/l10n/el.php index 7ef677bc746..a9f7f1fd18b 100644 --- a/settings/l10n/el.php +++ b/settings/l10n/el.php @@ -98,6 +98,7 @@ "Language" => "Γλώσσα", "Help translate" => "Βοηθήστε στη μετάφραση", "WebDAV" => "WebDAV", +"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Χρήση αυτής της διεύθυνσης για <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">πρόσβαση των αρχείων σας μέσω WebDAV</a>", "Login Name" => "Όνομα Σύνδεσης", "Create" => "Δημιουργία", "Admin Recovery Password" => "Κωδικός Επαναφοράς Διαχειριστή ", diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php index 30d0956a7e9..1e5b35989b5 100644 --- a/settings/l10n/et_EE.php +++ b/settings/l10n/et_EE.php @@ -56,6 +56,8 @@ "Allow apps to use the Share API" => "Luba rakendustel kasutada Share API-t", "Allow links" => "Luba lingid", "Allow users to share items to the public with links" => "Luba kasutajatel jagada kirjeid avalike linkidega", +"Allow public uploads" => "Luba avalikud üleslaadimised", +"Allow users to enable others to upload into their publicly shared folders" => "Luba kasutajatel üleslaadimine teiste poolt oma avalikult jagatud kataloogidesse ", "Allow resharing" => "Luba edasijagamine", "Allow users to share items shared with them again" => "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud", "Allow users to share with anyone" => "Luba kasutajatel kõigiga jagada", diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php index 16b10158c8c..e871ad2a099 100644 --- a/settings/l10n/gl.php +++ b/settings/l10n/gl.php @@ -56,6 +56,8 @@ "Allow apps to use the Share API" => "Permitir que os aplicativos empreguen o API para compartir", "Allow links" => "Permitir ligazóns", "Allow users to share items to the public with links" => "Permitir que os usuarios compartan elementos ao público con ligazóns", +"Allow public uploads" => "Permitir os envíos públicos", +"Allow users to enable others to upload into their publicly shared folders" => "Permitir que os usuarios lle permitan a outros enviar aos seus cartafoles compartidos publicamente", "Allow resharing" => "Permitir compartir", "Allow users to share items shared with them again" => "Permitir que os usuarios compartan de novo os elementos compartidos con eles", "Allow users to share with anyone" => "Permitir que os usuarios compartan con calquera", diff --git a/settings/l10n/it.php b/settings/l10n/it.php index e95adbf3c71..995be0e9980 100644 --- a/settings/l10n/it.php +++ b/settings/l10n/it.php @@ -56,6 +56,8 @@ "Allow apps to use the Share API" => "Consenti alle applicazioni di utilizzare le API di condivisione", "Allow links" => "Consenti collegamenti", "Allow users to share items to the public with links" => "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti", +"Allow public uploads" => "Consenti caricamenti pubblici", +"Allow users to enable others to upload into their publicly shared folders" => "Consenti agli utenti di abilitare altri al caricamento nelle loro cartelle pubbliche condivise", "Allow resharing" => "Consenti la ri-condivisione", "Allow users to share items shared with them again" => "Consenti agli utenti di condividere a loro volta elementi condivisi da altri", "Allow users to share with anyone" => "Consenti agli utenti di condividere con chiunque", diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php index b33aa5ba50c..a728c26689a 100644 --- a/settings/l10n/pt_BR.php +++ b/settings/l10n/pt_BR.php @@ -56,6 +56,8 @@ "Allow apps to use the Share API" => "Permitir que aplicativos usem a API de Compartilhamento", "Allow links" => "Permitir links", "Allow users to share items to the public with links" => "Permitir que usuários compartilhem itens com o público usando links", +"Allow public uploads" => "Permitir envio público", +"Allow users to enable others to upload into their publicly shared folders" => "Permitir que usuários deem permissão a outros para enviarem arquivios para suas pastas compartilhadas publicamente", "Allow resharing" => "Permitir recompartilhamento", "Allow users to share items shared with them again" => "Permitir que usuários compartilhem novamente itens compartilhados com eles", "Allow users to share with anyone" => "Permitir que usuários compartilhem com qualquer um", diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 057d527db73..2b14c1460d6 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -4,8 +4,6 @@ * See the COPYING-README file. */ $levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal'); - -$defaults = new OC_Defaults(); // initialize themable default strings and urls ?> <?php @@ -17,7 +15,7 @@ if (!$_['htaccessworking']) { <legend><strong><?php p($l->t('Security Warning'));?></strong></legend> <span class="securitywarning"> - <?php p($l->t('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.')); ?> + <?php p($l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file 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.')); ?> </span> </fieldset> @@ -32,7 +30,7 @@ if (!$_['isWebDavWorking']) { <span class="securitywarning"> <?php p($l->t('Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken.')); ?> - <?php print_unescaped($l->t('Please double check the <a href=\'%s\'>installation guides</a>.', 'http://doc.owncloud.org/server/5.0/admin_manual/installation.html')); ?> + <?php print_unescaped($l->t('Please double check the <a href="%s">installation guides</a>.', $theme->getDocBaseUrl().'/server/5.0/admin_manual/installation.html')); ?> </span> </fieldset> @@ -62,7 +60,7 @@ if (!$_['islocaleworking']) { <span class="connectionwarning"> <?php $locales = 'en_US.UTF-8/en_US.UTF8'; - p($l->t('This ownCloud server can\'t set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s.', array($locales, $locales))); + p($l->t('System locale can\'t be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s.', array($locales, $locales))); ?> </span> @@ -77,7 +75,7 @@ if (!$_['internetconnectionworking']) { <legend><strong><?php p($l->t('Internet connection not working'));?></strong></legend> <span class="connectionwarning"> - <?php p($l->t('This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud.')); ?> + <?php p($l->t('This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features.')); ?> </span> </fieldset> @@ -110,7 +108,7 @@ if (!$_['internetconnectionworking']) { print_unescaped('checked="checked"'); } ?>> <label for="backgroundjobs_webcron">Webcron</label><br/> - <em><?php p($l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http.")); ?></em> + <em><?php p($l->t("cron.php is registered at a webcron service to call cron.php once a minute over http.")); ?></em> </td> </tr> <tr> @@ -120,7 +118,7 @@ if (!$_['internetconnectionworking']) { print_unescaped('checked="checked"'); } ?>> <label for="backgroundjobs_cron">Cron</label><br/> - <em><?php p($l->t("Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute.")); ?></em> + <em><?php p($l->t("Use systems cron service to call the cron.php file once a minute.")); ?></em> </td> </tr> </table> @@ -191,10 +189,16 @@ if (!$_['internetconnectionworking']) { ?> <?php if (!$_['isConnectedViaHTTPS']) p('disabled'); ?> /> <label for="forcessl"><?php p($l->t('Enforce HTTPS'));?></label><br/> - <em><?php p($l->t('Enforces the clients to connect to ownCloud via an encrypted connection.')); ?></em> + <em><?php p($l->t( + 'Forces the clients to connect to %s via an encrypted connection.', + $theme->getName() + )); ?></em> <?php if (!$_['isConnectedViaHTTPS']) { print_unescaped("<br/><em>"); - p($l->t('Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement.')); + p($l->t( + 'Please connect to your %s via HTTPS to enable or disable the SSL enforcement.', + $theme->getName() + )); print_unescaped("</em>"); } ?> @@ -244,7 +248,7 @@ endfor;?> <fieldset class="personalblock"> <legend><strong><?php p($l->t('Version'));?></strong></legend> - <strong><?php p($defaults->getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?> + <strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getVersionString()); ?> <?php if (OC_Util::getEditionString() === ''): ?> <p> <?php print_unescaped($l->t('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>.')); ?> @@ -253,6 +257,6 @@ endfor;?> </fieldset> <fieldset class="personalblock credits-footer"> <p> - <?php print_unescaped($defaults->getShortFooter()); ?> + <?php print_unescaped($theme->getShortFooter()); ?> </p> </fieldset> diff --git a/settings/templates/personal.php b/settings/templates/personal.php index ee5ebae708f..b9d9b09f5d0 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -4,8 +4,6 @@ * See the COPYING-README file. */?> -<?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?> - <div class="clientsbox"> <h2><?php p($l->t('Get the apps to sync your files'));?></h2> <a href="<?php p($_['clients']['desktop']); ?>" target="_blank"> @@ -105,7 +103,7 @@ if($_['passwordChangeSupported']) { <fieldset class="personalblock"> <legend><strong><?php p($l->t('WebDAV'));?></strong></legend> <code><?php print_unescaped(OC_Helper::linkToRemote('webdav')); ?></code><br /> - <em><?php print_unescaped($l->t('Use this address to <a href="%s/server/5.0/user_manual/files/files.html" target="_blank">access your Files via WebDAV</a>', array($defaults->getDocBaseUrl())));?></em> + <em><?php print_unescaped($l->t('Use this address to <a href="%s/server/5.0/user_manual/files/files.html" target="_blank">access your Files via WebDAV</a>', array($theme->getDocBaseUrl())));?></em> </fieldset> <?php foreach($_['forms'] as $form) { @@ -114,13 +112,13 @@ if($_['passwordChangeSupported']) { <fieldset class="personalblock"> <legend><strong><?php p($l->t('Version'));?></strong></legend> - <strong><?php p($defaults->getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?><br/> + <strong><?php p($theme->getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?><br/> <?php if (OC_Util::getEditionString() === ''): ?> <?php print_unescaped($l->t('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>.')); ?> <?php endif; ?> </fieldset> <fieldset class="personalblock credits-footer"> <p> - <?php print_unescaped($defaults->getShortFooter()); ?> + <?php print_unescaped($theme->getShortFooter()); ?> </p> </fieldset> diff --git a/tests/lib/config.php b/tests/lib/config.php index 1a1d062d688..c67a66c832e 100644 --- a/tests/lib/config.php +++ b/tests/lib/config.php @@ -80,17 +80,6 @@ class Test_Config extends PHPUnit_Framework_TestCase { */ public function testWriteData() { $config = new OC\Config('/non-writable'); - // TODO never get's called, because the previous call throws the exception - // maybe include some more logic to create a readable dir and then try to - // write to this dir - // - // console commands: - // $ sudo touch /non-writableconfig.php - // $ sudo chmod go-rwx /non-writableconfig.php - // ---- call the tests now -> above statemant throws the exception - // - // $ sudo chmod go+r /non-writableconfig.php - // ---- call the tests now -> bellow statemant throws the exception $config->setValue('foo', 'bar'); } } diff --git a/tests/lib/group.php b/tests/lib/group.php index 9128bd7ddce..d2c9ce46148 100644 --- a/tests/lib/group.php +++ b/tests/lib/group.php @@ -1,56 +1,61 @@ <?php /** -* ownCloud -* -* @author Robin Appelman -* @author Bernhard Posselt -* @copyright 2012 Robin Appelman icewind@owncloud.com -* @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/>. -* -*/ + * ownCloud + * + * @author Robin Appelman + * @author Bernhard Posselt + * @copyright 2012 Robin Appelman icewind@owncloud.com + * @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/>. + * + */ class Test_Group extends PHPUnit_Framework_TestCase { function setUp() { OC_Group::clearBackends(); + OC_User::clearBackends(); } function testSingleBackend() { + $userBackend = new \OC_User_Dummy(); + \OC_User::getManager()->registerBackend($userBackend); OC_Group::useBackend(new OC_Group_Dummy()); - - $group1=uniqid(); - $group2=uniqid(); + + $group1 = uniqid(); + $group2 = uniqid(); OC_Group::createGroup($group1); OC_Group::createGroup($group2); - $user1=uniqid(); - $user2=uniqid(); + $user1 = uniqid(); + $user2 = uniqid(); + $userBackend->createUser($user1, ''); + $userBackend->createUser($user2, ''); $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((bool)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->assertFalse((bool)OC_Group::addToGroup($user1, $group1)); + $this->assertTrue(OC_Group::addToGroup($user1, $group1)); $this->assertEquals(array($user1), OC_Group::usersInGroup($group1)); $this->assertEquals(array(), OC_Group::usersInGroup($group2)); @@ -65,37 +70,37 @@ class Test_Group extends PHPUnit_Framework_TestCase { } - public function testNoEmptyGIDs(){ + public function testNoEmptyGIDs() { OC_Group::useBackend(new OC_Group_Dummy()); $emptyGroup = null; - $this->assertEquals(false, OC_Group::createGroup($emptyGroup)); + $this->assertFalse(OC_Group::createGroup($emptyGroup)); } - public function testNoGroupsTwice(){ + public function testNoGroupsTwice() { OC_Group::useBackend(new OC_Group_Dummy()); $group = uniqid(); OC_Group::createGroup($group); $groupCopy = $group; - $this->assertEquals(false, OC_Group::createGroup($groupCopy)); + OC_Group::createGroup($groupCopy); $this->assertEquals(array($group), OC_Group::getGroups()); } - public function testDontDeleteAdminGroup(){ + public function testDontDeleteAdminGroup() { OC_Group::useBackend(new OC_Group_Dummy()); $adminGroup = 'admin'; OC_Group::createGroup($adminGroup); - $this->assertEquals(false, OC_Group::deleteGroup($adminGroup)); + $this->assertFalse(OC_Group::deleteGroup($adminGroup)); $this->assertEquals(array($adminGroup), OC_Group::getGroups()); } - public function testDontAddUserToNonexistentGroup(){ + public function testDontAddUserToNonexistentGroup() { OC_Group::useBackend(new OC_Group_Dummy()); $groupNonExistent = 'notExistent'; $user = uniqid(); @@ -105,8 +110,11 @@ class Test_Group extends PHPUnit_Framework_TestCase { } - public function testUsersInGroup(){ + public function testUsersInGroup() { OC_Group::useBackend(new OC_Group_Dummy()); + $userBackend = new \OC_User_Dummy(); + \OC_User::getManager()->registerBackend($userBackend); + $group1 = uniqid(); $group2 = uniqid(); $group3 = uniqid(); @@ -117,27 +125,32 @@ class Test_Group extends PHPUnit_Framework_TestCase { OC_Group::createGroup($group2); OC_Group::createGroup($group3); + $userBackend->createUser($user1, ''); + $userBackend->createUser($user2, ''); + $userBackend->createUser($user3, ''); + OC_Group::addToGroup($user1, $group1); OC_Group::addToGroup($user2, $group1); OC_Group::addToGroup($user3, $group1); OC_Group::addToGroup($user3, $group2); $this->assertEquals(array($user1, $user2, $user3), - OC_Group::usersInGroups(array($group1, $group2, $group3))); + OC_Group::usersInGroups(array($group1, $group2, $group3))); // FIXME: needs more parameter variation } - function testMultiBackend() { - $backend1=new OC_Group_Dummy(); - $backend2=new OC_Group_Dummy(); + $userBackend = new \OC_User_Dummy(); + \OC_User::getManager()->registerBackend($userBackend); + $backend1 = new OC_Group_Dummy(); + $backend2 = new OC_Group_Dummy(); OC_Group::useBackend($backend1); OC_Group::useBackend($backend2); - $group1=uniqid(); - $group2=uniqid(); + $group1 = uniqid(); + $group2 = uniqid(); OC_Group::createGroup($group1); //groups should be added to the first registered backend @@ -154,20 +167,23 @@ class Test_Group extends PHPUnit_Framework_TestCase { $this->assertTrue(OC_Group::groupExists($group1)); $this->assertTrue(OC_Group::groupExists($group2)); - $user1=uniqid(); - $user2=uniqid(); + $user1 = uniqid(); + $user2 = uniqid(); + + $userBackend->createUser($user1, ''); + $userBackend->createUser($user2, ''); $this->assertFalse(OC_Group::inGroup($user1, $group1)); $this->assertFalse(OC_Group::inGroup($user2, $group1)); - $this->assertTrue((bool)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->assertFalse((bool)OC_Group::addToGroup($user1, $group1)); + OC_Group::addToGroup($user1, $group1); $this->assertEquals(array($user1), OC_Group::usersInGroup($group1)); diff --git a/tests/lib/group/group.php b/tests/lib/group/group.php new file mode 100644 index 00000000000..75e975d9e65 --- /dev/null +++ b/tests/lib/group/group.php @@ -0,0 +1,316 @@ +<?php + +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace Test\Group; + +use OC\User\User; + +class Group extends \PHPUnit_Framework_TestCase { + /** + * @return \PHPUnit_Framework_MockObject_MockObject | \OC\User\Manager + */ + protected function getUserManager() { + $userManager = $this->getMock('\OC\User\Manager'); + $user1 = new User('user1', null); + $user2 = new User('user2', null); + $user3 = new User('user3', null); + $userManager->expects($this->any()) + ->method('get') + ->will($this->returnValueMap(array( + array('user1', $user1), + array('user2', $user2), + array('user3', $user3) + ))); + return $userManager; + } + + public function testGetUsersSingleBackend() { + $backend = $this->getMock('OC_Group_Database'); + $userManager = $this->getUserManager(); + $group = new \OC\Group\Group('group1', array($backend), $userManager); + + $backend->expects($this->once()) + ->method('usersInGroup') + ->with('group1') + ->will($this->returnValue(array('user1', 'user2'))); + + $users = $group->getUsers(); + + $this->assertEquals(2, count($users)); + $user1 = $users[0]; + $user2 = $users[1]; + $this->assertEquals('user1', $user1->getUID()); + $this->assertEquals('user2', $user2->getUID()); + } + + public function testGetUsersMultipleBackends() { + $backend1 = $this->getMock('OC_Group_Database'); + $backend2 = $this->getMock('OC_Group_Database'); + $userManager = $this->getUserManager(); + $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); + + $backend1->expects($this->once()) + ->method('usersInGroup') + ->with('group1') + ->will($this->returnValue(array('user1', 'user2'))); + + $backend2->expects($this->once()) + ->method('usersInGroup') + ->with('group1') + ->will($this->returnValue(array('user2', 'user3'))); + + $users = $group->getUsers(); + + $this->assertEquals(3, count($users)); + $user1 = $users[0]; + $user2 = $users[1]; + $user3 = $users[2]; + $this->assertEquals('user1', $user1->getUID()); + $this->assertEquals('user2', $user2->getUID()); + $this->assertEquals('user3', $user3->getUID()); + } + + public function testInGroupSingleBackend() { + $backend = $this->getMock('OC_Group_Database'); + $userManager = $this->getUserManager(); + $group = new \OC\Group\Group('group1', array($backend), $userManager); + + $backend->expects($this->once()) + ->method('inGroup') + ->with('user1', 'group1') + ->will($this->returnValue(true)); + + $this->assertTrue($group->inGroup(new User('user1', null))); + } + + public function testInGroupMultipleBackends() { + $backend1 = $this->getMock('OC_Group_Database'); + $backend2 = $this->getMock('OC_Group_Database'); + $userManager = $this->getUserManager(); + $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); + + $backend1->expects($this->once()) + ->method('inGroup') + ->with('user1', 'group1') + ->will($this->returnValue(false)); + + $backend2->expects($this->once()) + ->method('inGroup') + ->with('user1', 'group1') + ->will($this->returnValue(true)); + + $this->assertTrue($group->inGroup(new User('user1', null))); + } + + public function testAddUser() { + $backend = $this->getMock('OC_Group_Database'); + $userManager = $this->getUserManager(); + $group = new \OC\Group\Group('group1', array($backend), $userManager); + + $backend->expects($this->once()) + ->method('inGroup') + ->with('user1', 'group1') + ->will($this->returnValue(false)); + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(true)); + + $backend->expects($this->once()) + ->method('addToGroup') + ->with('user1', 'group1'); + + $group->addUser(new User('user1', null)); + } + + public function testAddUserAlreadyInGroup() { + $backend = $this->getMock('OC_Group_Database'); + $userManager = $this->getUserManager(); + $group = new \OC\Group\Group('group1', array($backend), $userManager); + + $backend->expects($this->once()) + ->method('inGroup') + ->with('user1', 'group1') + ->will($this->returnValue(true)); + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(true)); + + $backend->expects($this->never()) + ->method('addToGroup'); + + $group->addUser(new User('user1', null)); + } + + public function testRemoveUser() { + $backend = $this->getMock('OC_Group_Database'); + $userManager = $this->getUserManager(); + $group = new \OC\Group\Group('group1', array($backend), $userManager); + + $backend->expects($this->once()) + ->method('inGroup') + ->with('user1', 'group1') + ->will($this->returnValue(true)); + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(true)); + + $backend->expects($this->once()) + ->method('removeFromGroup') + ->with('user1', 'group1'); + + $group->removeUser(new User('user1', null)); + } + + public function testRemoveUserNotInGroup() { + $backend = $this->getMock('OC_Group_Database'); + $userManager = $this->getUserManager(); + $group = new \OC\Group\Group('group1', array($backend), $userManager); + + $backend->expects($this->once()) + ->method('inGroup') + ->with('user1', 'group1') + ->will($this->returnValue(false)); + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(true)); + + $backend->expects($this->never()) + ->method('removeFromGroup'); + + $group->removeUser(new User('user1', null)); + } + + public function testRemoveUserMultipleBackends() { + $backend1 = $this->getMock('OC_Group_Database'); + $backend2 = $this->getMock('OC_Group_Database'); + $userManager = $this->getUserManager(); + $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); + + $backend1->expects($this->once()) + ->method('inGroup') + ->with('user1', 'group1') + ->will($this->returnValue(true)); + $backend1->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(true)); + + $backend1->expects($this->once()) + ->method('removeFromGroup') + ->with('user1', 'group1'); + + $backend2->expects($this->once()) + ->method('inGroup') + ->with('user1', 'group1') + ->will($this->returnValue(true)); + $backend2->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(true)); + + $backend2->expects($this->once()) + ->method('removeFromGroup') + ->with('user1', 'group1'); + + $group->removeUser(new User('user1', null)); + } + + public function testSearchUsers() { + $backend = $this->getMock('OC_Group_Database'); + $userManager = $this->getUserManager(); + $group = new \OC\Group\Group('group1', array($backend), $userManager); + + $backend->expects($this->once()) + ->method('usersInGroup') + ->with('group1', '2') + ->will($this->returnValue(array('user2'))); + + $users = $group->searchUsers('2'); + + $this->assertEquals(1, count($users)); + $user2 = $users[0]; + $this->assertEquals('user2', $user2->getUID()); + } + + public function testSearchUsersMultipleBackends() { + $backend1 = $this->getMock('OC_Group_Database'); + $backend2 = $this->getMock('OC_Group_Database'); + $userManager = $this->getUserManager(); + $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); + + $backend1->expects($this->once()) + ->method('usersInGroup') + ->with('group1', '2') + ->will($this->returnValue(array('user2'))); + $backend2->expects($this->once()) + ->method('usersInGroup') + ->with('group1', '2') + ->will($this->returnValue(array('user2'))); + + $users = $group->searchUsers('2'); + + $this->assertEquals(1, count($users)); + $user2 = $users[0]; + $this->assertEquals('user2', $user2->getUID()); + } + + public function testSearchUsersLimitAndOffset() { + $backend = $this->getMock('OC_Group_Database'); + $userManager = $this->getUserManager(); + $group = new \OC\Group\Group('group1', array($backend), $userManager); + + $backend->expects($this->once()) + ->method('usersInGroup') + ->with('group1', 'user', 1, 1) + ->will($this->returnValue(array('user2'))); + + $users = $group->searchUsers('user', 1, 1); + + $this->assertEquals(1, count($users)); + $user2 = $users[0]; + $this->assertEquals('user2', $user2->getUID()); + } + + public function testSearchUsersMultipleBackendsLimitAndOffset() { + $backend1 = $this->getMock('OC_Group_Database'); + $backend2 = $this->getMock('OC_Group_Database'); + $userManager = $this->getUserManager(); + $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); + + $backend1->expects($this->once()) + ->method('usersInGroup') + ->with('group1', 'user', 2, 1) + ->will($this->returnValue(array('user2'))); + $backend2->expects($this->once()) + ->method('usersInGroup') + ->with('group1', 'user', 1, 0) + ->will($this->returnValue(array('user1'))); + + $users = $group->searchUsers('user', 2, 1); + + $this->assertEquals(2, count($users)); + $user2 = $users[0]; + $user1 = $users[1]; + $this->assertEquals('user2', $user2->getUID()); + $this->assertEquals('user1', $user1->getUID()); + } + + public function testDelete() { + $backend = $this->getMock('OC_Group_Database'); + $userManager = $this->getUserManager(); + $group = new \OC\Group\Group('group1', array($backend), $userManager); + + $backend->expects($this->once()) + ->method('deleteGroup') + ->with('group1'); + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(true)); + + $group->delete(); + } +} diff --git a/tests/lib/group/manager.php b/tests/lib/group/manager.php new file mode 100644 index 00000000000..9d3adf51a0c --- /dev/null +++ b/tests/lib/group/manager.php @@ -0,0 +1,313 @@ +<?php + +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace Test\Group; + +use OC\User\User; + +class Manager extends \PHPUnit_Framework_TestCase { + public function testGet() { + /** + * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend + */ + $backend = $this->getMock('\OC_Group_Database'); + $backend->expects($this->any()) + ->method('groupExists') + ->with('group1') + ->will($this->returnValue(true)); + + /** + * @var \OC\User\Manager $userManager + */ + $userManager = $this->getMock('\OC\User\Manager'); + $manager = new \OC\Group\Manager($userManager); + $manager->addBackend($backend); + + $group = $manager->get('group1'); + $this->assertNotNull($group); + $this->assertEquals('group1', $group->getGID()); + } + + public function testGetNoBackend() { + /** + * @var \OC\User\Manager $userManager + */ + $userManager = $this->getMock('\OC\User\Manager'); + $manager = new \OC\Group\Manager($userManager); + + $this->assertNull($manager->get('group1')); + } + + public function testGetNotExists() { + /** + * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend + */ + $backend = $this->getMock('\OC_Group_Database'); + $backend->expects($this->once()) + ->method('groupExists') + ->with('group1') + ->will($this->returnValue(false)); + + /** + * @var \OC\User\Manager $userManager + */ + $userManager = $this->getMock('\OC\User\Manager'); + $manager = new \OC\Group\Manager($userManager); + $manager->addBackend($backend); + + $this->assertNull($manager->get('group1')); + } + + public function testGetDeleted() { + $backend = new \OC_Group_Dummy(); + $backend->createGroup('group1'); + + /** + * @var \OC\User\Manager $userManager + */ + $userManager = $this->getMock('\OC\User\Manager'); + $manager = new \OC\Group\Manager($userManager); + $manager->addBackend($backend); + + $group = $manager->get('group1'); + $group->delete(); + $this->assertNull($manager->get('group1')); + } + + public function testGetMultipleBackends() { + /** + * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1 + */ + $backend1 = $this->getMock('\OC_Group_Database'); + $backend1->expects($this->any()) + ->method('groupExists') + ->with('group1') + ->will($this->returnValue(false)); + + /** + * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend2 + */ + $backend2 = $this->getMock('\OC_Group_Database'); + $backend2->expects($this->any()) + ->method('groupExists') + ->with('group1') + ->will($this->returnValue(true)); + + /** + * @var \OC\User\Manager $userManager + */ + $userManager = $this->getMock('\OC\User\Manager'); + $manager = new \OC\Group\Manager($userManager); + $manager->addBackend($backend1); + $manager->addBackend($backend2); + + $group = $manager->get('group1'); + $this->assertNotNull($group); + $this->assertEquals('group1', $group->getGID()); + } + + public function testCreate() { + /** + * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend + */ + $backend = $this->getMock('\OC_Group_Database'); + $backend->expects($this->any()) + ->method('groupExists') + ->with('group1') + ->will($this->returnValue(false)); + $backend->expects($this->once()) + ->method('implementsActions') + ->will($this->returnValue(true)); + $backend->expects($this->once()) + ->method('createGroup'); + + /** + * @var \OC\User\Manager $userManager + */ + $userManager = $this->getMock('\OC\User\Manager'); + $manager = new \OC\Group\Manager($userManager); + $manager->addBackend($backend); + + $group = $manager->createGroup('group1'); + $this->assertEquals('group1', $group->getGID()); + } + + public function testCreateExists() { + /** + * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend + */ + $backend = $this->getMock('\OC_Group_Database'); + $backend->expects($this->any()) + ->method('groupExists') + ->with('group1') + ->will($this->returnValue(true)); + $backend->expects($this->never()) + ->method('createGroup'); + + /** + * @var \OC\User\Manager $userManager + */ + $userManager = $this->getMock('\OC\User\Manager'); + $manager = new \OC\Group\Manager($userManager); + $manager->addBackend($backend); + + $group = $manager->createGroup('group1'); + $this->assertEquals('group1', $group->getGID()); + } + + public function testSearch() { + /** + * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend + */ + $backend = $this->getMock('\OC_Group_Database'); + $backend->expects($this->once()) + ->method('getGroups') + ->with('1') + ->will($this->returnValue(array('group1'))); + + /** + * @var \OC\User\Manager $userManager + */ + $userManager = $this->getMock('\OC\User\Manager'); + $manager = new \OC\Group\Manager($userManager); + $manager->addBackend($backend); + + $groups = $manager->search('1'); + $this->assertEquals(1, count($groups)); + $group1 = $groups[0]; + $this->assertEquals('group1', $group1->getGID()); + } + + public function testSearchMultipleBackends() { + /** + * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1 + */ + $backend1 = $this->getMock('\OC_Group_Database'); + $backend1->expects($this->once()) + ->method('getGroups') + ->with('1') + ->will($this->returnValue(array('group1'))); + + /** + * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend2 + */ + $backend2 = $this->getMock('\OC_Group_Database'); + $backend2->expects($this->once()) + ->method('getGroups') + ->with('1') + ->will($this->returnValue(array('group12', 'group1'))); + + /** + * @var \OC\User\Manager $userManager + */ + $userManager = $this->getMock('\OC\User\Manager'); + $manager = new \OC\Group\Manager($userManager); + $manager->addBackend($backend1); + $manager->addBackend($backend2); + + $groups = $manager->search('1'); + $this->assertEquals(2, count($groups)); + $group1 = $groups[0]; + $group12 = $groups[1]; + $this->assertEquals('group1', $group1->getGID()); + $this->assertEquals('group12', $group12->getGID()); + } + + public function testSearchMultipleBackendsLimitAndOffset() { + /** + * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1 + */ + $backend1 = $this->getMock('\OC_Group_Database'); + $backend1->expects($this->once()) + ->method('getGroups') + ->with('1', 2, 1) + ->will($this->returnValue(array('group1'))); + + /** + * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend2 + */ + $backend2 = $this->getMock('\OC_Group_Database'); + $backend2->expects($this->once()) + ->method('getGroups') + ->with('1', 1, 0) + ->will($this->returnValue(array('group12'))); + + /** + * @var \OC\User\Manager $userManager + */ + $userManager = $this->getMock('\OC\User\Manager'); + $manager = new \OC\Group\Manager($userManager); + $manager->addBackend($backend1); + $manager->addBackend($backend2); + + $groups = $manager->search('1', 2, 1); + $this->assertEquals(2, count($groups)); + $group1 = $groups[0]; + $group12 = $groups[1]; + $this->assertEquals('group1', $group1->getGID()); + $this->assertEquals('group12', $group12->getGID()); + } + + public function testGetUserGroups() { + /** + * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend + */ + $backend = $this->getMock('\OC_Group_Database'); + $backend->expects($this->once()) + ->method('getUserGroups') + ->with('user1') + ->will($this->returnValue(array('group1'))); + + /** + * @var \OC\User\Manager $userManager + */ + $userManager = $this->getMock('\OC\User\Manager'); + $manager = new \OC\Group\Manager($userManager); + $manager->addBackend($backend); + + $groups = $manager->getUserGroups(new User('user1', null)); + $this->assertEquals(1, count($groups)); + $group1 = $groups[0]; + $this->assertEquals('group1', $group1->getGID()); + } + + public function testGetUserGroupsMultipleBackends() { + /** + * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1 + */ + $backend1 = $this->getMock('\OC_Group_Database'); + $backend1->expects($this->once()) + ->method('getUserGroups') + ->with('user1') + ->will($this->returnValue(array('group1'))); + /** + * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend2 + */ + $backend2 = $this->getMock('\OC_Group_Database'); + $backend2->expects($this->once()) + ->method('getUserGroups') + ->with('user1') + ->will($this->returnValue(array('group1', 'group2'))); + + /** + * @var \OC\User\Manager $userManager + */ + $userManager = $this->getMock('\OC\User\Manager'); + $manager = new \OC\Group\Manager($userManager); + $manager->addBackend($backend1); + $manager->addBackend($backend2); + + $groups = $manager->getUserGroups(new User('user1', null)); + $this->assertEquals(2, count($groups)); + $group1 = $groups[0]; + $group2 = $groups[1]; + $this->assertEquals('group1', $group1->getGID()); + $this->assertEquals('group2', $group2->getGID()); + } +} diff --git a/tests/lib/memcache/apc.php b/tests/lib/memcache/apc.php index 6b2a49470ba..e5d753a4fa5 100644 --- a/tests/lib/memcache/apc.php +++ b/tests/lib/memcache/apc.php @@ -15,6 +15,10 @@ class APC extends Cache { $this->markTestSkipped('The apc extension is not available.'); return; } + if(\OC\Memcache\APCu::isAvailable()) { + $this->markTestSkipped('The apc extension is emulated by ACPu.'); + return; + } $this->instance=new \OC\Memcache\APC(uniqid()); } } diff --git a/tests/lib/memcache/apcu.php b/tests/lib/memcache/apcu.php new file mode 100644 index 00000000000..7b99e7cd5e0 --- /dev/null +++ b/tests/lib/memcache/apcu.php @@ -0,0 +1,20 @@ +<?php + +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace Test\Memcache; + +class APCu extends Cache { + public function setUp() { + if(!\OC\Memcache\APCu::isAvailable()) { + $this->markTestSkipped('The APCu extension is not available.'); + return; + } + $this->instance=new \OC\Memcache\APCu(uniqid()); + } +} diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml index 23b2d6c0060..a893e96ad97 100644 --- a/tests/phpunit-autotest.xml +++ b/tests/phpunit-autotest.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <phpunit bootstrap="bootstrap.php" strict="true" + verbose="true" timeoutForSmallTests="900" timeoutForMediumTests="900" timeoutForLargeTests="900" |
