From f2b5bc8ab8fadaee3db3a03e6a4748fdb28a01b1 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Thu, 7 Feb 2013 14:47:56 +0100 Subject: [PATCH 001/103] adding autotesting for mssql server - windows only --- autotest.cmd | 47 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/autotest.cmd b/autotest.cmd index 053860db54..e5ea0cf4c3 100644 --- a/autotest.cmd +++ b/autotest.cmd @@ -4,14 +4,14 @@ :: @author Thomas Müller :: @author Tobias Ramforth (translated into Windows batch file) :: -:: @copyright 2012 Thomas Müller thomas.mueller@tmit.eu +:: @copyright 2012, 2013 Thomas Müller thomas.mueller@tmit.eu :: @echo off set DATADIR=data-autotest set BASEDIR=%~dp0 -:: create autoconfig for sqlite, mysql and postgresql +:: create autoconfig for sqlite, mysql, postgresql and mssql echo ^ .\tests\autoconfig-sqlite.php echo $AUTOCONFIG ^= array ^( >> .\tests\autoconfig-sqlite.php echo 'installed' ^=^> false^, >> .\tests\autoconfig-sqlite.php @@ -50,16 +50,35 @@ echo 'dbhost' ^=^> 'localhost'^, >> .\tests\autoconfig-pgsql.php echo 'dbpass' ^=^> 'owncloud'^, >> .\tests\autoconfig-pgsql.php echo ^)^; >> .\tests\autoconfig-pgsql.php +echo ^ .\tests\autoconfig-mssql.php +echo $AUTOCONFIG ^= array ^( >> .\tests\autoconfig-mssql.php +echo 'installed' ^=^> false^, >> .\tests\autoconfig-mssql.php +echo 'dbtype' ^=^> 'mssql'^, >> .\tests\autoconfig-mssql.php +echo 'dbtableprefix' ^=^> 'oc_'^, >> .\tests\autoconfig-mssql.php +echo 'adminlogin' ^=^> 'admin'^, >> .\tests\autoconfig-mssql.php +echo 'adminpass' ^=^> 'admin'^, >> .\tests\autoconfig-mssql.php +echo 'directory' ^=^> '%BASEDIR%%DATADIR%'^, >> .\tests\autoconfig-mssql.php +echo 'dbuser' ^=^> 'oc_autotest'^, >> .\tests\autoconfig-mssql.php +echo 'dbname' ^=^> 'oc_autotest'^, >> .\tests\autoconfig-mssql.php +echo 'dbhost' ^=^> 'localhost\sqlexpress'^, >> .\tests\autoconfig-mssql.php +echo 'dbpass' ^=^> 'owncloud'^, >> .\tests\autoconfig-mssql.php +echo ^)^; >> .\tests\autoconfig-mssql.php + echo localhost:5432:*:oc_autotest:owncloud > %APPDATA%\postgresql\pgpass.conf :: :: start test execution :: -::call:execute_tests "sqlite" -call:execute_tests "mysql" -::call:execute_tests "mssql" -::call:execute_tests "ora" -::call:execute_tests "pgsql" +if [%1] == [] ( + echo "Running on all database backends" + call:execute_tests "sqlite" + call:execute_tests "mysql" + call:execute_tests "mssql" + ::call:execute_tests "ora" + call:execute_tests "pgsql" +) else ( + call:execute_tests "%1" +) goto:eof @@ -83,6 +102,9 @@ goto:eof if "%~1" == "mysql" mysql -u oc_autotest -powncloud -e "DROP DATABASE oc_autotest" if "%~1" == "pgsql" dropdb -h localhost -p 5432 -U oc_autotest -w oc_autotest + + :: we assume a sqlexpress installation + if "%~1" == "mssql" sqlcmd -S localhost\sqlexpress -U oc_autotext -P owncloud -Q "IF EXISTS (SELECT name FROM sys.databases WHERE name=N'oc_autotest') DROP DATABASE [oc_autotest]" :: copy autoconfig copy /y %BASEDIR%\tests\autoconfig-%~1.php %BASEDIR%\config\autoconfig.php @@ -96,9 +118,8 @@ goto:eof rmdir /s /q coverage-html-%~1 md coverage-html-%~1 php -f enable_all.php - ::phpunit --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1 - ::phpunit --bootstrap bootstrap.php --configuration phpunit.xml - php win32-phpunit.php --bootstrap bootstrap.php --configuration phpunit.xml --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1 + + php win32-phpunit.php --bootstrap bootstrap.php --configuration phpunit-autotest.xml --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1 echo "Done with testing %~1 ..." cd %BASEDIR% goto:eof @@ -114,4 +135,10 @@ goto:eof :: - to enable dropdb I decided to add following line to pg_hba.conf (this is not the safest way but I don't care for the testing machine): :: local all all trust :: +:: NOTES on mssql: +:: we assume the usage of a local installed sqlexpress +:: create a user 'oc_autotest' with password 'owncloud' and assign the server role 'dbcreator' +:: make sure the sqlserver is configured to allow sql authentication +:: + From d577f790c8cbcf4f8dce74f9991e4bd62e21f949 Mon Sep 17 00:00:00 2001 From: Tobias Ramforth Date: Fri, 8 Feb 2013 00:00:51 +0100 Subject: [PATCH 002/103] Added MS SQL Server support --- core/js/setup.js | 7 ++ core/setup.php | 2 + core/templates/installation.php | 20 +++- lib/db.php | 180 +++++++++++++++++++++++++++++++- lib/setup.php | 148 +++++++++++++++++++++++++- 5 files changed, 346 insertions(+), 11 deletions(-) diff --git a/core/js/setup.js b/core/js/setup.js index 9aded6591c..fb6e7c5097 100644 --- a/core/js/setup.js +++ b/core/js/setup.js @@ -5,6 +5,7 @@ $(document).ready(function() { mysql:!!$('#hasMySQL').val(), postgresql:!!$('#hasPostgreSQL').val(), oracle:!!$('#hasOracle').val(), + mssql:!!$('#hasMSSQL').val() }; $('#selectDbType').buttonset(); @@ -41,6 +42,12 @@ $(document).ready(function() { $('#dbhost').show(250); $('#dbhostlabel').show(250); }); + + $('#mssql').click(function() { + $('#use_other_db').slideDown(250); + $('#dbhost').show(250); + $('#dbhostlabel').show(250); + }); $('input[checked]').trigger('click'); diff --git a/core/setup.php b/core/setup.php index 66b8cf378b..0da9b35a35 100644 --- a/core/setup.php +++ b/core/setup.php @@ -16,6 +16,7 @@ $hasSQLite = class_exists('SQLite3'); $hasMySQL = is_callable('mysql_connect'); $hasPostgreSQL = is_callable('pg_connect'); $hasOracle = is_callable('oci_connect'); +$hasMSSQL = is_callable('sqlsrv_connect'); $datadir = OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data'); // Protect data directory here, so we can test if the protection is working @@ -26,6 +27,7 @@ $opts = array( 'hasMySQL' => $hasMySQL, 'hasPostgreSQL' => $hasPostgreSQL, 'hasOracle' => $hasOracle, + 'hasMSSQLServer' => $hasMSSQL, 'directory' => $datadir, 'secureRNG' => OC_Util::secureRNG_available(), 'htaccessWorking' => OC_Util::ishtaccessworking(), diff --git a/core/templates/installation.php b/core/templates/installation.php index 03c580c9b0..6a6370785d 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -2,6 +2,7 @@ '> '> '> +'>
0): ?> @@ -55,7 +56,7 @@
- + t( 'Configure the database' ); ?>
@@ -71,7 +72,7 @@ - +

MySQL t( 'will be used' ); ?>.

@@ -81,7 +82,7 @@ - +

PostgreSQL t( 'will be used' ); ?>.

@@ -91,7 +92,7 @@ - +

Oracle t( 'will be used' ); ?>.

@@ -99,6 +100,17 @@ /> + + + + +

MS SQL t( 'will be used' ); ?>.

+ + + + /> + +
diff --git a/lib/db.php b/lib/db.php index 51f7c7679d..58f46c1171 100644 --- a/lib/db.php +++ b/lib/db.php @@ -178,6 +178,13 @@ class OC_DB { $dsn = 'oci:dbname=//' . $host . '/' . $name; } break; + case 'mssql': + if ($port) { + $dsn='sqlsrv:Server='.$host.','.$port.';Database='.$name; + } else { + $dsn='sqlsrv:Server='.$host.';Database='.$name; + } + break; default: return false; } @@ -277,6 +284,15 @@ class OC_DB { $dsn['database'] = $user; } break; + case 'mssql': + $dsn = array( + 'phptype' => 'sqlsrv', + 'username' => $user, + 'password' => $pass, + 'hostspec' => $host, + 'database' => $name + ); + break; default: return false; } @@ -540,7 +556,7 @@ class OC_DB { * http://www.sqlite.org/lang_createtable.html * http://docs.oracle.com/cd/B19306_01/server.102/b14200/functions037.htm */ - if( $CONFIG_DBTYPE == 'pgsql' ) { //mysql support it too but sqlite doesn't + if( $CONFIG_DBTYPE == 'pgsql' || 'mssql') { //mysql support it too but sqlite doesn't $content = str_replace( '0000-00-00 00:00:00', 'CURRENT_TIMESTAMP', $content ); } file_put_contents( $file2, $content ); @@ -624,7 +640,7 @@ class OC_DB { } else { return true; } - } elseif( $type == 'pgsql' || $type == 'oci' || $type == 'mysql') { + } elseif( $type == 'pgsql' || $type == 'oci' || $type == 'mysql' || $type == 'mssql') { $query = 'INSERT INTO `' .$table . '` (' . implode(',', array_keys($input)) . ') SELECT \'' . implode('\',\'', array_values($input)) . '\' FROM ' . $table . ' WHERE '; @@ -683,7 +699,15 @@ class OC_DB { }elseif( $type == 'oci' ) { $query = str_replace( '`', '"', $query ); $query = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $query ); - } + }elseif( $type == 'mssql' ) { + $query = preg_replace( "/\`(.*?)`/", "[$1]", $query ); + $query = str_replace( 'NOW()', 'CURRENT_TIMESTAMP', $query ); + $query = str_replace( 'now()', 'CURRENT_TIMESTAMP', $query ); + $query = str_replace( 'LENGTH(', 'LEN(', $query ); + $query = str_replace( 'SUBSTR(', 'SUBSTRING(', $query ); + + $query = self::fixLimitClauseForMSSQL($query); + } // replace table name prefix $query = str_replace( '*PREFIX*', $prefix, $query ); @@ -691,6 +715,60 @@ class OC_DB { return $query; } + private static function fixLimitClauseForMSSQL($query) { + $limitLocation = stripos ($query, "LIMIT"); + + if ( $limitLocation === false ) { + return $query; + } + + // total == 0 means all results - not zero results + // + // First number is either total or offset, locate it by first space + // + $offset = substr ($query, $limitLocation + 5); + $offset = substr ($offset, 0, stripos ($offset, ' ')); + $offset = trim ($offset); + + // check for another parameter + if (stripos ($offset, ',') === false) { + // no more parameters + $offset = 0; + $total = intval ($offset); + } else { + // found another parameter + $offset = intval ($offset); + + $total = substr ($query, $limitLocation + 5); + $total = substr ($total, stripos ($total, ',')); + + $total = substr ($total, 0, stripos ($total, ' ')); + $total = intval ($total); + } + + $query = trim (substr ($query, 0, $limitLocation)); + + if ($offset == 0 && $total !== 0) { + if (strpos($query, "SELECT") === false) { + $query = "TOP {$total} " . $query; + } else { + $query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP '.$total, $query); + } + } else if ($offset > 0) { + $query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP(10000000) ', $query); + $query = 'SELECT * + FROM (SELECT sub2.*, ROW_NUMBER() OVER(ORDER BY sub2.line2) AS line3 + FROM (SELECT 1 AS line2, sub1.* FROM (' . $query . ') AS sub1) as sub2) AS sub3'; + + if ($total > 0) { + $query .= ' WHERE line3 BETWEEN ' . ($offset + 1) . ' AND ' . ($offset + $total); + } else { + $query .= ' WHERE line3 > ' . $offset; + } + } + return $query; + } + /** * @brief drop a table * @param string $tableName the table to drop @@ -844,6 +922,14 @@ class PDOStatementWrapper{ public function execute($input=array()) { $this->lastArguments=$input; if(count($input)>0) { + if (!isset($type)) { + $type = OC_Config::getValue( "dbtype", "sqlite" ); + } + + if ($type == 'mssql') { + $this->tryFixSubstringLastArgumentDataForMSSQL($input); + } + $result=$this->statement->execute($input); }else{ $result=$this->statement->execute(); @@ -855,6 +941,94 @@ class PDOStatementWrapper{ } } + private function tryFixSubstringLastArgumentDataForMSSQL(&$input) { + $query = $this->statement->queryString; + $pos = stripos ($query, 'SUBSTRING'); + + if ( $pos === false) { + return; + } + + try { + $newQuery = ''; + + $cArg = 0; + + $inSubstring = false; + + // Create new query + for ($i = 0; $i < strlen ($query); $i++) { + if ($inSubstring == false) { + // Defines when we should start inserting values + if (substr ($query, $i, 9) == 'SUBSTRING') { + $inSubstring = true; + } + } else { + // Defines when we should stop inserting values + if (substr ($query, $i, 1) == ')') { + $inSubstring = false; + } + } + + if (substr ($query, $i, 1) == '?') { + // We found a question mark + if ($inSubstring) { + $newQuery .= $input[$cArg]; + + // + // Remove from input array + // + array_splice ($input, $cArg, 1); + } else { + $newQuery .= substr ($query, $i, 1); + $cArg++; + } + } else { + $newQuery .= substr ($query, $i, 1); + } + } + + // The global data we need + $name = OC_Config::getValue( "dbname", "owncloud" ); + $host = OC_Config::getValue( "dbhost", "" ); + $user = OC_Config::getValue( "dbuser", "" ); + $pass = OC_Config::getValue( "dbpassword", "" ); + if (strpos($host,':')) { + list($host, $port) = explode(':', $host, 2); + } else { + $port = false; + } + $opts = array(); + + if ($port) { + $dsn = 'sqlsrv:Server='.$host.','.$port.';Database='.$name; + } else { + $dsn = 'sqlsrv:Server='.$host.';Database='.$name; + } + + $PDO = new PDO($dsn, $user, $pass, $opts); + $PDO->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC); + $PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + + $this->statement = $PDO->prepare($newQuery); + + $this->lastArguments = $input; + } catch (PDOException $e){ + $entry = 'PDO DB Error: "'.$e->getMessage().'"
'; + $entry .= 'Offending command was: '.$this->statement->queryString .'
'; + $entry .= 'Input parameters: ' .print_r($input, true).'
'; + $entry .= 'Stack trace: ' .$e->getTraceAsString().'
'; + OC_Log::write('core', $entry, OC_Log::FATAL); + OC_User::setUserId(null); + + // send http status 503 + header('HTTP/1.1 503 Service Temporarily Unavailable'); + header('Status: 503 Service Temporarily Unavailable'); + OC_Template::printErrorPage('Failed to connect to database'); + die ($entry); + } + } + /** * provide numRows */ diff --git a/lib/setup.php b/lib/setup.php index 4dd190b99f..d4ea26354e 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -33,12 +33,14 @@ class OC_Setup { $error[] = 'Specify a data folder.'; } - if($dbtype=='mysql' or $dbtype == 'pgsql' or $dbtype == 'oci') { //mysql and postgresql needs more config options - if($dbtype=='mysql') + if($dbtype == 'mysql' or $dbtype == 'pgsql' or $dbtype == 'oci' or $dbtype == 'mssql') { //mysql and postgresql needs more config options + if($dbtype == 'mysql') $dbprettyname = 'MySQL'; - else if($dbtype=='pgsql') + else if($dbtype == 'pgsql') $dbprettyname = 'PostgreSQL'; - else + else if ($dbtype == 'mssql') + $dbprettyname = 'MS SQL Server'; + else $dbprettyname = 'Oracle'; @@ -145,6 +147,29 @@ class OC_Setup { return $error; } } + elseif ($dbtype == 'mssql') { + $dbuser = $options['dbuser']; + $dbpass = $options['dbpass']; + $dbname = $options['dbname']; + $dbhost = $options['dbhost']; + $dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_'; + + OC_Config::setValue('dbname', $dbname); + OC_Config::setValue('dbhost', $dbhost); + OC_Config::setValue('dbuser', $dbuser); + OC_Config::setValue('dbpassword', $dbpass); + OC_Config::setValue('dbtableprefix', $dbtableprefix); + + try { + self::setupMSSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix); + } catch (Exception $e) { + $error[] = array( + 'error' => 'MS SQL username and/or password not valid', + 'hint' => 'You need to enter either an existing account or the administrator.' + ); + return $error; + } + } else { //delete the old sqlite database first, might cause infinte loops otherwise if(file_exists("$datadir/owncloud.db")) { @@ -563,6 +588,121 @@ class OC_Setup { } } + private static function setupMSSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix) { + //check if the database user has admin right + $masterConnectionInfo = array( "Database" => "master", "UID" => $dbuser, "PWD" => $dbpass); + + $masterConnection = @sqlsrv_connect($dbhost, $masterConnectionInfo); + if(!$masterConnection) { + $entry = null; + if( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + throw new Exception('MS SQL username and/or password not valid: '.$entry); + } + + OC_Config::setValue('dbuser', $dbuser); + OC_Config::setValue('dbpassword', $dbpass); + + self::mssql_createDBLogin($dbuser, $dbpass, $masterConnection); + + self::mssql_createDatabase($dbname, $masterConnection); + + self::mssql_createDBUser($dbuser, $dbpass, $masterConnection); + + sqlsrv_close($masterConnection); + + $connectionInfo = array( "Database" => $dbname, "UID" => $dbuser, "PWD" => $dbpass); + + $connection = @sqlsrv_connect($dbhost, $connectionInfo); + + //fill the database if needed + $query="SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '{$dbname}' AND TABLE_NAME = '{$dbtableprefix}users'"; + $result = sqlsrv_query($connection, $query); + if($result) { + $row=sqlsrv_fetch_array($result); + } + + if(!$result or $row[0] == 0) { + OC_DB::createDbFromStructure('db_structure.xml'); + } + + sqlsrv_close($connection); + } + + private static function mssql_createDBLogin($name, $password, $connection) { + $query = "SELECT * FROM master.sys.server_principals WHERE name = '".$name."';"; + $result = sqlsrv_query($connection, $query); + if ($result) { + $row = sqlsrv_fetch_array($result); + } + + if (!$result or $row[0] == 0) { + $query = "CREATE LOGIN [".$name."] WITH PASSWORD = '".$password."';"; + $result = sqlsrv_query($connection, $query); + if (!$result or $result === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } + } + } + + private static function mssql_createDBUser($name, $dbname, $connection) { + $query = "SELECT * FROM [".$dbname."].sys.database_principals WHERE name = '".$name."';"; + $result = sqlsrv_query($connection, $query); + if($result) { + $row=sqlsrv_fetch_array($result); + } + + if (!$result or $row[0] == 0) { + $query = "USE [".$dbname."]; CREATE USER [".$name."] FOR LOGIN [".$name."];"; + $result = sqlsrv_query($connection, $query); + if (!$result or $result === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } + } + + $query = "USE [".$dbname."]; EXEC sp_addrolemember 'db_owner', '".$name."';"; + $result = sqlsrv_query($connection, $query); + if (!$result or $result === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } + } + + private static function mssql_createDatabase($dbname, $connection) { + $query = "CREATE DATABASE [".$dbname."];"; + $result = sqlsrv_query($connection, $query); + if (!$result or $result === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } + } + + /** * create .htaccess files for apache hosts */ From 41ec976fd74320c379f95d05d3a490310f06402e Mon Sep 17 00:00:00 2001 From: Administrator Date: Sun, 10 Feb 2013 13:07:59 +0100 Subject: [PATCH 003/103] Bugfixes and cleanup MS SQL Server installation --- core/js/setup.js | 4 +- core/setup.php | 2 +- core/templates/installation.php | 2 +- lib/db.php | 36 +++--- lib/setup.php | 191 +++++++++++++++++++++----------- 5 files changed, 148 insertions(+), 87 deletions(-) diff --git a/core/js/setup.js b/core/js/setup.js index fb6e7c5097..cb8392d0a3 100644 --- a/core/js/setup.js +++ b/core/js/setup.js @@ -5,7 +5,7 @@ $(document).ready(function() { mysql:!!$('#hasMySQL').val(), postgresql:!!$('#hasPostgreSQL').val(), oracle:!!$('#hasOracle').val(), - mssql:!!$('#hasMSSQL').val() + mssql:!!$('#hasMSSQL').val() }; $('#selectDbType').buttonset(); @@ -43,7 +43,7 @@ $(document).ready(function() { $('#dbhostlabel').show(250); }); - $('#mssql').click(function() { + $('#mssql').click(function() { $('#use_other_db').slideDown(250); $('#dbhost').show(250); $('#dbhostlabel').show(250); diff --git a/core/setup.php b/core/setup.php index 0da9b35a35..6ea16cdcc4 100644 --- a/core/setup.php +++ b/core/setup.php @@ -27,7 +27,7 @@ $opts = array( 'hasMySQL' => $hasMySQL, 'hasPostgreSQL' => $hasPostgreSQL, 'hasOracle' => $hasOracle, - 'hasMSSQLServer' => $hasMSSQL, + 'hasMSSQL' => $hasMSSQL, 'directory' => $datadir, 'secureRNG' => OC_Util::secureRNG_available(), 'htaccessWorking' => OC_Util::ishtaccessworking(), diff --git a/core/templates/installation.php b/core/templates/installation.php index 6a6370785d..4a41527c90 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -107,7 +107,7 @@

MS SQL t( 'will be used' ); ?>.

- + /> diff --git a/lib/db.php b/lib/db.php index 58f46c1171..c3ff481e19 100644 --- a/lib/db.php +++ b/lib/db.php @@ -284,7 +284,7 @@ class OC_DB { $dsn['database'] = $user; } break; - case 'mssql': + case 'mssql': $dsn = array( 'phptype' => 'sqlsrv', 'username' => $user, @@ -292,7 +292,7 @@ class OC_DB { 'hostspec' => $host, 'database' => $name ); - break; + break; default: return false; } @@ -920,28 +920,30 @@ class PDOStatementWrapper{ * make execute return the result instead of a bool */ public function execute($input=array()) { - $this->lastArguments=$input; - if(count($input)>0) { - if (!isset($type)) { - $type = OC_Config::getValue( "dbtype", "sqlite" ); - } - - if ($type == 'mssql') { - $this->tryFixSubstringLastArgumentDataForMSSQL($input); - } - + $this->lastArguments = $input; + if (count($input) > 0) { + + if (!isset($type)) { + $type = OC_Config::getValue( "dbtype", "sqlite" ); + } + + if ($type == 'mssql') { + $input = $this->tryFixSubstringLastArgumentDataForMSSQL($input); + } + $result=$this->statement->execute($input); - }else{ + } else { $result=$this->statement->execute(); } - if($result) { + + if ($result) { return $this; - }else{ + } else { return false; } } - private function tryFixSubstringLastArgumentDataForMSSQL(&$input) { + private function tryFixSubstringLastArgumentDataForMSSQL($input) { $query = $this->statement->queryString; $pos = stripos ($query, 'SUBSTRING'); @@ -1013,6 +1015,8 @@ class PDOStatementWrapper{ $this->statement = $PDO->prepare($newQuery); $this->lastArguments = $input; + + return $input; } catch (PDOException $e){ $entry = 'PDO DB Error: "'.$e->getMessage().'"
'; $entry .= 'Offending command was: '.$this->statement->queryString .'
'; diff --git a/lib/setup.php b/lib/setup.php index d4ea26354e..3efad79cfa 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -610,98 +610,155 @@ class OC_Setup { self::mssql_createDatabase($dbname, $masterConnection); - self::mssql_createDBUser($dbuser, $dbpass, $masterConnection); + self::mssql_createDBUser($dbuser, $dbname, $masterConnection); sqlsrv_close($masterConnection); - $connectionInfo = array( "Database" => $dbname, "UID" => $dbuser, "PWD" => $dbpass); - - $connection = @sqlsrv_connect($dbhost, $connectionInfo); - - //fill the database if needed - $query="SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '{$dbname}' AND TABLE_NAME = '{$dbtableprefix}users'"; - $result = sqlsrv_query($connection, $query); - if($result) { - $row=sqlsrv_fetch_array($result); - } - - if(!$result or $row[0] == 0) { - OC_DB::createDbFromStructure('db_structure.xml'); - } - - sqlsrv_close($connection); + self::mssql_createDatabaseStructure($dbname, $dbuser, $dbpass); } private static function mssql_createDBLogin($name, $password, $connection) { $query = "SELECT * FROM master.sys.server_principals WHERE name = '".$name."';"; $result = sqlsrv_query($connection, $query); - if ($result) { + if ($result === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } else { $row = sqlsrv_fetch_array($result); - } - if (!$result or $row[0] == 0) { - $query = "CREATE LOGIN [".$name."] WITH PASSWORD = '".$password."';"; - $result = sqlsrv_query($connection, $query); - if (!$result or $result === false) { - if ( ($errors = sqlsrv_errors() ) != null) { - $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; - } else { - $entry = ''; - } - $entry.='Offending command was: '.$query.'
'; - echo($entry); - } + if ($row === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } else { + if ($row == null) { + $query = "CREATE LOGIN [".$name."] WITH PASSWORD = '".$password."';"; + $result = sqlsrv_query($connection, $query); + if (!$result or $result === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } + } + } } } private static function mssql_createDBUser($name, $dbname, $connection) { $query = "SELECT * FROM [".$dbname."].sys.database_principals WHERE name = '".$name."';"; $result = sqlsrv_query($connection, $query); - if($result) { - $row=sqlsrv_fetch_array($result); + if ($result === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } else { + $row = sqlsrv_fetch_array($result); + + if ($row === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } else { + if ($row == null) { + $query = "USE [".$dbname."]; CREATE USER [".$name."] FOR LOGIN [".$name."];"; + $result = sqlsrv_query($connection, $query); + if (!$result || $result === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry = 'DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } + } + + $query = "USE [".$dbname."]; EXEC sp_addrolemember 'db_owner', '".$name."';"; + $result = sqlsrv_query($connection, $query); + if (!$result || $result === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } + } } - - if (!$result or $row[0] == 0) { - $query = "USE [".$dbname."]; CREATE USER [".$name."] FOR LOGIN [".$name."];"; - $result = sqlsrv_query($connection, $query); - if (!$result or $result === false) { - if ( ($errors = sqlsrv_errors() ) != null) { - $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; - } else { - $entry = ''; - } - $entry.='Offending command was: '.$query.'
'; - echo($entry); - } - } - - $query = "USE [".$dbname."]; EXEC sp_addrolemember 'db_owner', '".$name."';"; - $result = sqlsrv_query($connection, $query); - if (!$result or $result === false) { - if ( ($errors = sqlsrv_errors() ) != null) { - $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; - } else { - $entry = ''; - } - $entry.='Offending command was: '.$query.'
'; - echo($entry); - } } private static function mssql_createDatabase($dbname, $connection) { $query = "CREATE DATABASE [".$dbname."];"; $result = sqlsrv_query($connection, $query); - if (!$result or $result === false) { - if ( ($errors = sqlsrv_errors() ) != null) { - $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; - } else { - $entry = ''; - } - $entry.='Offending command was: '.$query.'
'; - echo($entry); + if (!$result || $result === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); } } + private static function mssql_createDatabaseStructure($dbname, $dbuser, $dbpass) { + $connectionInfo = array( "Database" => $dbname, "UID" => $dbuser, "PWD" => $dbpass); + + $connection = @sqlsrv_connect($dbhost, $connectionInfo); + + //fill the database if needed + $query = "SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '{$dbname}' AND TABLE_NAME = '{$dbtableprefix}users'"; + $result = sqlsrv_query($connection, $query); + if ($result === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } else { + $row = sqlsrv_fetch_array($result); + + if ($row === false) { + if ( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } + $entry.='Offending command was: '.$query.'
'; + echo($entry); + } else { + if ($row == null) { + OC_DB::createDbFromStructure('db_structure.xml'); + } + } + } + + sqlsrv_close($connection); + } /** * create .htaccess files for apache hosts From 4e5a3fbcafcaa0cdaba351dfb307b0000179c832 Mon Sep 17 00:00:00 2001 From: Administrator Date: Sun, 10 Feb 2013 14:08:00 +0100 Subject: [PATCH 004/103] - Fixed indentations. - Fixed a bug in legacy.php: there was an error that was not checked for if the table 'fscache' did not exist in the database. --- lib/db.php | 144 ++++++++++++++++++------------------- lib/files/cache/legacy.php | 6 ++ 2 files changed, 78 insertions(+), 72 deletions(-) diff --git a/lib/db.php b/lib/db.php index c3ff481e19..3ccd51737a 100644 --- a/lib/db.php +++ b/lib/db.php @@ -943,95 +943,95 @@ class PDOStatementWrapper{ } } - private function tryFixSubstringLastArgumentDataForMSSQL($input) { - $query = $this->statement->queryString; - $pos = stripos ($query, 'SUBSTRING'); - - if ( $pos === false) { - return; - } - - try { - $newQuery = ''; + private function tryFixSubstringLastArgumentDataForMSSQL($input) { + $query = $this->statement->queryString; + $pos = stripos ($query, 'SUBSTRING'); - $cArg = 0; + if ( $pos === false) { + return; + } - $inSubstring = false; + try { + $newQuery = ''; - // Create new query - for ($i = 0; $i < strlen ($query); $i++) { - if ($inSubstring == false) { - // Defines when we should start inserting values - if (substr ($query, $i, 9) == 'SUBSTRING') { - $inSubstring = true; - } - } else { - // Defines when we should stop inserting values - if (substr ($query, $i, 1) == ')') { - $inSubstring = false; - } - } + $cArg = 0; - if (substr ($query, $i, 1) == '?') { - // We found a question mark - if ($inSubstring) { - $newQuery .= $input[$cArg]; + $inSubstring = false; - // - // Remove from input array - // - array_splice ($input, $cArg, 1); - } else { - $newQuery .= substr ($query, $i, 1); - $cArg++; - } - } else { - $newQuery .= substr ($query, $i, 1); - } - } + // Create new query + for ($i = 0; $i < strlen ($query); $i++) { + if ($inSubstring == false) { + // Defines when we should start inserting values + if (substr ($query, $i, 9) == 'SUBSTRING') { + $inSubstring = true; + } + } else { + // Defines when we should stop inserting values + if (substr ($query, $i, 1) == ')') { + $inSubstring = false; + } + } - // The global data we need - $name = OC_Config::getValue( "dbname", "owncloud" ); - $host = OC_Config::getValue( "dbhost", "" ); - $user = OC_Config::getValue( "dbuser", "" ); - $pass = OC_Config::getValue( "dbpassword", "" ); - if (strpos($host,':')) { - list($host, $port) = explode(':', $host, 2); - } else { - $port = false; - } - $opts = array(); + if (substr ($query, $i, 1) == '?') { + // We found a question mark + if ($inSubstring) { + $newQuery .= $input[$cArg]; - if ($port) { - $dsn = 'sqlsrv:Server='.$host.','.$port.';Database='.$name; - } else { - $dsn = 'sqlsrv:Server='.$host.';Database='.$name; - } + // + // Remove from input array + // + array_splice ($input, $cArg, 1); + } else { + $newQuery .= substr ($query, $i, 1); + $cArg++; + } + } else { + $newQuery .= substr ($query, $i, 1); + } + } - $PDO = new PDO($dsn, $user, $pass, $opts); - $PDO->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC); - $PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + // The global data we need + $name = OC_Config::getValue( "dbname", "owncloud" ); + $host = OC_Config::getValue( "dbhost", "" ); + $user = OC_Config::getValue( "dbuser", "" ); + $pass = OC_Config::getValue( "dbpassword", "" ); + if (strpos($host,':')) { + list($host, $port) = explode(':', $host, 2); + } else { + $port = false; + } + $opts = array(); - $this->statement = $PDO->prepare($newQuery); + if ($port) { + $dsn = 'sqlsrv:Server='.$host.','.$port.';Database='.$name; + } else { + $dsn = 'sqlsrv:Server='.$host.';Database='.$name; + } - $this->lastArguments = $input; - - return $input; - } catch (PDOException $e){ + $PDO = new PDO($dsn, $user, $pass, $opts); + $PDO->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC); + $PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + + $this->statement = $PDO->prepare($newQuery); + + $this->lastArguments = $input; + + return $input; + } catch (PDOException $e){ $entry = 'PDO DB Error: "'.$e->getMessage().'"
'; $entry .= 'Offending command was: '.$this->statement->queryString .'
'; $entry .= 'Input parameters: ' .print_r($input, true).'
'; $entry .= 'Stack trace: ' .$e->getTraceAsString().'
'; OC_Log::write('core', $entry, OC_Log::FATAL); - OC_User::setUserId(null); + OC_User::setUserId(null); - // send http status 503 - header('HTTP/1.1 503 Service Temporarily Unavailable'); - header('Status: 503 Service Temporarily Unavailable'); - OC_Template::printErrorPage('Failed to connect to database'); - die ($entry); + // send http status 503 + header('HTTP/1.1 503 Service Temporarily Unavailable'); + header('Status: 503 Service Temporarily Unavailable'); + OC_Template::printErrorPage('Failed to connect to database'); + die ($entry); } - } + } /** * provide numRows diff --git a/lib/files/cache/legacy.php b/lib/files/cache/legacy.php index 33d4b8e7c9..bdc3cbf00b 100644 --- a/lib/files/cache/legacy.php +++ b/lib/files/cache/legacy.php @@ -51,6 +51,12 @@ class Legacy { $this->cacheHasItems = false; return false; } + + if ($result === false || property_exists($result, 'error_message_prefix')) { + $this->cacheHasItems = false; + return false; + } + $this->cacheHasItems = (bool)$result->fetchRow(); return $this->cacheHasItems; } From ff09a1f37baa5ad5bd63c57ec5384e3ffbc38ad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Sun, 10 Feb 2013 14:17:18 +0100 Subject: [PATCH 005/103] don't use OC_FilesystemView() --- apps/files_versions/lib/hooks.php | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php index dc02c605c4..6c87eba423 100644 --- a/apps/files_versions/lib/hooks.php +++ b/apps/files_versions/lib/hooks.php @@ -20,13 +20,10 @@ class Hooks { public static function write_hook( $params ) { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { - - $versions = new Storage( new \OC\Files\View('') ); - $path = $params[\OC\Files\Filesystem::signal_param_path]; - - if($path<>'') $versions->store( $path ); - + if($path<>'') { + Storage::store($path); + } } } @@ -40,12 +37,10 @@ class Hooks { */ public static function remove_hook($params) { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { - - $versions = new Storage( new \OC_FilesystemView('') ); - $path = $params[\OC\Files\Filesystem::signal_param_path]; - - if($path<>'') $versions->delete( $path ); + if($path<>'') { + Storage::delete($path); + } } } @@ -59,13 +54,11 @@ class Hooks { */ public static function rename_hook($params) { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { - - $versions = new Storage( new \OC_FilesystemView('') ); - $oldpath = $params['oldpath']; $newpath = $params['newpath']; - - if($oldpath<>'' && $newpath<>'') $versions->rename( $oldpath, $newpath ); + if($oldpath<>'' && $newpath<>'') { + Storage::rename( $oldpath, $newpath ); + } } } From 0c31c3cc3a928e8ca9272d32d68163c0700697ea Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Mon, 11 Feb 2013 23:46:32 +0100 Subject: [PATCH 006/103] fixing user for autotesting mssql --- autotest.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autotest.cmd b/autotest.cmd index e5ea0cf4c3..a511faef9c 100644 --- a/autotest.cmd +++ b/autotest.cmd @@ -104,7 +104,7 @@ goto:eof if "%~1" == "pgsql" dropdb -h localhost -p 5432 -U oc_autotest -w oc_autotest :: we assume a sqlexpress installation - if "%~1" == "mssql" sqlcmd -S localhost\sqlexpress -U oc_autotext -P owncloud -Q "IF EXISTS (SELECT name FROM sys.databases WHERE name=N'oc_autotest') DROP DATABASE [oc_autotest]" + if "%~1" == "mssql" sqlcmd -S localhost\sqlexpress -U oc_autotest -P owncloud -Q "IF EXISTS (SELECT name FROM sys.databases WHERE name=N'oc_autotest') DROP DATABASE [oc_autotest]" :: copy autoconfig copy /y %BASEDIR%\tests\autoconfig-%~1.php %BASEDIR%\config\autoconfig.php From b2dfdacaa1cb6d7839aed3b4d39adc6504a4beef Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Tue, 12 Feb 2013 01:04:35 +0100 Subject: [PATCH 007/103] fixing undefined variables --- lib/setup.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/setup.php b/lib/setup.php index 893e0121ff..6f2899ed86 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -591,7 +591,7 @@ class OC_Setup { echo($entry); } } - // grant neccessary roles + // grant necessary roles $query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name; $stmt = oci_parse($connection, $query); if (!$stmt) { @@ -634,7 +634,7 @@ class OC_Setup { sqlsrv_close($masterConnection); - self::mssql_createDatabaseStructure($dbname, $dbuser, $dbpass); + self::mssql_createDatabaseStructure($dbhost, $dbname, $dbuser, $dbpass, $dbtableprefix); } private static function mssql_createDBLogin($name, $password, $connection) { @@ -730,7 +730,7 @@ class OC_Setup { } private static function mssql_createDatabase($dbname, $connection) { - $query = "CREATE DATABASE [".$dbname."];"; + $query = "CREATE DATABASE IF NOT EXISTS [".$dbname."];"; $result = sqlsrv_query($connection, $query); if (!$result || $result === false) { if ( ($errors = sqlsrv_errors() ) != null) { @@ -742,8 +742,10 @@ class OC_Setup { echo($entry); } } - - private static function mssql_createDatabaseStructure($dbname, $dbuser, $dbpass) { + + // private static function setupMSSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username) { + + private static function mssql_createDatabaseStructure($dbhost, $dbname, $dbuser, $dbpass, $dbtableprefix) { $connectionInfo = array( "Database" => $dbname, "UID" => $dbuser, "PWD" => $dbpass); $connection = @sqlsrv_connect($dbhost, $connectionInfo); From 81368510105c06be21c52a699f77da4764ae6a03 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Tue, 12 Feb 2013 01:05:47 +0100 Subject: [PATCH 008/103] fixing indent --- lib/setup.php | 70 +++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/lib/setup.php b/lib/setup.php index 6f2899ed86..a71e906a85 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -46,8 +46,8 @@ class OC_Setup { else if($dbtype == 'pgsql') $dbprettyname = 'PostgreSQL'; else if ($dbtype == 'mssql') - $dbprettyname = 'MS SQL Server'; - else + $dbprettyname = 'MS SQL Server'; + else $dbprettyname = 'Oracle'; @@ -100,7 +100,7 @@ class OC_Setup { $error[] = array( 'error' => $e->getMessage(), 'hint' => $e->getHint() - ); + ); return($error); } catch (Exception $e) { $error[] = array( @@ -154,13 +154,13 @@ class OC_Setup { return $error; } } - elseif ($dbtype == 'mssql') { + elseif ($dbtype == 'mssql') { $dbuser = $options['dbuser']; $dbpass = $options['dbpass']; $dbname = $options['dbname']; $dbhost = $options['dbhost']; $dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_'; - + OC_Config::setValue('dbname', $dbname); OC_Config::setValue('dbhost', $dbhost); OC_Config::setValue('dbuser', $dbuser); @@ -176,7 +176,7 @@ class OC_Setup { ); return $error; } - } + } else { //delete the old sqlite database first, might cause infinte loops otherwise if(file_exists("$datadir/owncloud.db")) { @@ -199,7 +199,7 @@ class OC_Setup { OC_Appconfig::setValue('core', 'lastupdatedat', microtime(true)); OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php'); OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php'); - + OC_Group::createGroup('admin'); OC_Group::addToGroup($username, 'admin'); OC_User::login($username, $password); @@ -298,7 +298,7 @@ class OC_Setup { $query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'"; $result = mysql_query($query, $connection); if (!$result) { - throw new DatabaseSetupException($l->t("MySQL user '%s'@'%%' already exists", array($name)), + throw new DatabaseSetupException($l->t("MySQL user '%s'@'%%' already exists", array($name)), $l->t("Drop this user from MySQL.")); } } @@ -570,7 +570,7 @@ class OC_Setup { $result = oci_execute($stmt); if(!$result) { $entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '
'; - $entry .= $l->t('Offending command was: "%s", name: %s, password: %s', + $entry .= $l->t('Offending command was: "%s", name: %s, password: %s', array($query, $name, $password)) . '
'; echo($entry); } @@ -602,7 +602,7 @@ class OC_Setup { $result = oci_execute($stmt); if(!$result) { $entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '
'; - $entry .= $l->t('Offending command was: "%s", name: %s, password: %s', + $entry .= $l->t('Offending command was: "%s", name: %s, password: %s', array($query, $name, $password)) . '
'; echo($entry); } @@ -611,15 +611,15 @@ class OC_Setup { private static function setupMSSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix) { //check if the database user has admin right $masterConnectionInfo = array( "Database" => "master", "UID" => $dbuser, "PWD" => $dbpass); - + $masterConnection = @sqlsrv_connect($dbhost, $masterConnectionInfo); if(!$masterConnection) { - $entry = null; - if( ($errors = sqlsrv_errors() ) != null) { - $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; - } else { - $entry = ''; - } + $entry = null; + if( ($errors = sqlsrv_errors() ) != null) { + $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; + } else { + $entry = ''; + } throw new Exception('MS SQL username and/or password not valid: '.$entry); } @@ -627,17 +627,17 @@ class OC_Setup { OC_Config::setValue('dbpassword', $dbpass); self::mssql_createDBLogin($dbuser, $dbpass, $masterConnection); - + self::mssql_createDatabase($dbname, $masterConnection); - + self::mssql_createDBUser($dbuser, $dbname, $masterConnection); sqlsrv_close($masterConnection); self::mssql_createDatabaseStructure($dbhost, $dbname, $dbuser, $dbpass, $dbtableprefix); - } + } - private static function mssql_createDBLogin($name, $password, $connection) { + private static function mssql_createDBLogin($name, $password, $connection) { $query = "SELECT * FROM master.sys.server_principals WHERE name = '".$name."';"; $result = sqlsrv_query($connection, $query); if ($result === false) { @@ -650,7 +650,7 @@ class OC_Setup { echo($entry); } else { $row = sqlsrv_fetch_array($result); - + if ($row === false) { if ( ($errors = sqlsrv_errors() ) != null) { $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; @@ -671,7 +671,7 @@ class OC_Setup { } $entry.='Offending command was: '.$query.'
'; echo($entry); - } + } } } } @@ -690,7 +690,7 @@ class OC_Setup { echo($entry); } else { $row = sqlsrv_fetch_array($result); - + if ($row === false) { if ( ($errors = sqlsrv_errors() ) != null) { $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; @@ -698,7 +698,7 @@ class OC_Setup { $entry = ''; } $entry.='Offending command was: '.$query.'
'; - echo($entry); + echo($entry); } else { if ($row == null) { $query = "USE [".$dbname."]; CREATE USER [".$name."] FOR LOGIN [".$name."];"; @@ -711,7 +711,7 @@ class OC_Setup { } $entry.='Offending command was: '.$query.'
'; echo($entry); - } + } } $query = "USE [".$dbname."]; EXEC sp_addrolemember 'db_owner', '".$name."';"; @@ -726,9 +726,9 @@ class OC_Setup { echo($entry); } } - } + } } - + private static function mssql_createDatabase($dbname, $connection) { $query = "CREATE DATABASE IF NOT EXISTS [".$dbname."];"; $result = sqlsrv_query($connection, $query); @@ -736,12 +736,12 @@ class OC_Setup { if ( ($errors = sqlsrv_errors() ) != null) { $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; } else { - $entry = ''; + $entry = ''; } $entry.='Offending command was: '.$query.'
'; echo($entry); } - } + } // private static function setupMSSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username) { @@ -760,10 +760,10 @@ class OC_Setup { $entry = ''; } $entry.='Offending command was: '.$query.'
'; - echo($entry); + echo($entry); } else { $row = sqlsrv_fetch_array($result); - + if ($row === false) { if ( ($errors = sqlsrv_errors() ) != null) { $entry='DB Error: "'.print_r(sqlsrv_errors()).'"
'; @@ -771,17 +771,17 @@ class OC_Setup { $entry = ''; } $entry.='Offending command was: '.$query.'
'; - echo($entry); + echo($entry); } else { if ($row == null) { OC_DB::createDbFromStructure('db_structure.xml'); } } } - + sqlsrv_close($connection); } - + /** * create .htaccess files for apache hosts */ From 98d7e0f7cdaa53b3a8906d1a8f497f237130b44d Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Tue, 12 Feb 2013 01:14:53 +0100 Subject: [PATCH 009/103] write any database messages / non critical errors to the log - don't pollute the browser --- lib/setup.php | 65 ++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/lib/setup.php b/lib/setup.php index a71e906a85..128c53269e 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -279,10 +279,11 @@ class OC_Setup { if(!$result) { $entry = $l->t('DB Error: "%s"', array(mysql_error($connection))) . '
'; $entry .= $l->t('Offending command was: "%s"', array($query)) . '
'; - echo($entry); + \OC_Log::write('setup.mssql', $entry, \OC_Log::WARN); } $query="GRANT ALL PRIVILEGES ON `$name` . * TO '$user'"; - $result = mysql_query($query, $connection); //this query will fail if there aren't the right permissons, ignore the error + //this query will fail if there aren't the right permissions, ignore the error + mysql_query($query, $connection); } private static function createDBUser($name, $password, $connection) { @@ -381,7 +382,7 @@ class OC_Setup { if(!$result) { $entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '
'; $entry .= $l->t('Offending command was: "%s"', array($query)) . '
'; - echo($entry); + \OC_Log::write('setup.pg', $entry, \OC_Log::WARN); } if(! pg_fetch_row($result)) { //The database does not exists... let's create it @@ -390,11 +391,11 @@ class OC_Setup { if(!$result) { $entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '
'; $entry .= $l->t('Offending command was: "%s"', array($query)) . '
'; - echo($entry); + \OC_Log::write('setup.pg', $entry, \OC_Log::WARN); } else { $query = "REVOKE ALL PRIVILEGES ON DATABASE \"$e_name\" FROM PUBLIC"; - $result = pg_query($connection, $query); + pg_query($connection, $query); } } } @@ -408,7 +409,7 @@ class OC_Setup { if(!$result) { $entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '
'; $entry .= $l->t('Offending command was: "%s"', array($query)) . '
'; - echo($entry); + \OC_Log::write('setup.pg', $entry, \OC_Log::WARN); } if(! pg_fetch_row($result)) { @@ -418,7 +419,7 @@ class OC_Setup { if(!$result) { $entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '
'; $entry .= $l->t('Offending command was: "%s"', array($query)) . '
'; - echo($entry); + \OC_Log::write('setup.pg', $entry, \OC_Log::WARN); } } else { // change password of the existing role @@ -427,7 +428,7 @@ class OC_Setup { if(!$result) { $entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '
'; $entry .= $l->t('Offending command was: "%s"', array($query)) . '
'; - echo($entry); + \OC_Log::write('setup.pg', $entry, \OC_Log::WARN); } } } @@ -454,7 +455,7 @@ class OC_Setup { if (!$stmt) { $entry = $l->t('DB Error: "%s"', array(oci_last_error($connection))) . '
'; $entry .= $l->t('Offending command was: "%s"', array($query)) . '
'; - echo($entry); + \OC_Log::write('setup.oci', $entry, \OC_Log::WARN); } $result = oci_execute($stmt); if($result) { @@ -518,9 +519,9 @@ class OC_Setup { $un = $dbtableprefix.'users'; oci_bind_by_name($stmt, ':un', $un); if (!$stmt) { - $entry = $l->t('DB Error: "%s"', array(oci_last_error($connection))) . '
'; + $entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '
'; $entry .= $l->t('Offending command was: "%s"', array($query)) . '
'; - echo($entry); + \OC_Log::write('setup.oci', $entry, \OC_Log::WARN); } $result = oci_execute($stmt); @@ -546,14 +547,14 @@ class OC_Setup { if (!$stmt) { $entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '
'; $entry .= $l->t('Offending command was: "%s"', array($query)) . '
'; - echo($entry); + \OC_Log::write('setup.oci', $entry, \OC_Log::WARN); } oci_bind_by_name($stmt, ':un', $name); $result = oci_execute($stmt); if(!$result) { $entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '
'; $entry .= $l->t('Offending command was: "%s"', array($query)) . '
'; - echo($entry); + \OC_Log::write('setup.oci', $entry, \OC_Log::WARN); } if(! oci_fetch_row($stmt)) { @@ -564,7 +565,7 @@ class OC_Setup { if (!$stmt) { $entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '
'; $entry .= $l->t('Offending command was: "%s"', array($query)) . '
'; - echo($entry); + \OC_Log::write('setup.oci', $entry, \OC_Log::WARN); } //oci_bind_by_name($stmt, ':un', $name); $result = oci_execute($stmt); @@ -572,7 +573,7 @@ class OC_Setup { $entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '
'; $entry .= $l->t('Offending command was: "%s", name: %s, password: %s', array($query, $name, $password)) . '
'; - echo($entry); + \OC_Log::write('setup.oci', $entry, \OC_Log::WARN); } } else { // change password of the existing role $query = "ALTER USER :un IDENTIFIED BY :pw"; @@ -580,7 +581,7 @@ class OC_Setup { if (!$stmt) { $entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '
'; $entry .= $l->t('Offending command was: "%s"', array($query)) . '
'; - echo($entry); + \OC_Log::write('setup.oci', $entry, \OC_Log::WARN); } oci_bind_by_name($stmt, ':un', $name); oci_bind_by_name($stmt, ':pw', $password); @@ -588,7 +589,7 @@ class OC_Setup { if(!$result) { $entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '
'; $entry .= $l->t('Offending command was: "%s"', array($query)) . '
'; - echo($entry); + \OC_Log::write('setup.oci', $entry, \OC_Log::WARN); } } // grant necessary roles @@ -597,18 +598,20 @@ class OC_Setup { if (!$stmt) { $entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '
'; $entry .= $l->t('Offending command was: "%s"', array($query)) . '
'; - echo($entry); + \OC_Log::write('setup.oci', $entry, \OC_Log::WARN); } $result = oci_execute($stmt); if(!$result) { $entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '
'; $entry .= $l->t('Offending command was: "%s", name: %s, password: %s', array($query, $name, $password)) . '
'; - echo($entry); + \OC_Log::write('setup.oci', $entry, \OC_Log::WARN); } } private static function setupMSSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix) { + $l = self::getTrans(); + //check if the database user has admin right $masterConnectionInfo = array( "Database" => "master", "UID" => $dbuser, "PWD" => $dbpass); @@ -620,7 +623,7 @@ class OC_Setup { } else { $entry = ''; } - throw new Exception('MS SQL username and/or password not valid: '.$entry); + throw new Exception($l->t('MS SQL username and/or password not valid: $s', array($entry))); } OC_Config::setValue('dbuser', $dbuser); @@ -647,7 +650,7 @@ class OC_Setup { $entry = ''; } $entry.='Offending command was: '.$query.'
'; - echo($entry); + \OC_Log::write('setup.mssql', $entry, \OC_Log::WARN); } else { $row = sqlsrv_fetch_array($result); @@ -658,7 +661,7 @@ class OC_Setup { $entry = ''; } $entry.='Offending command was: '.$query.'
'; - echo($entry); + \OC_Log::write('setup.mssql', $entry, \OC_Log::WARN); } else { if ($row == null) { $query = "CREATE LOGIN [".$name."] WITH PASSWORD = '".$password."';"; @@ -670,7 +673,7 @@ class OC_Setup { $entry = ''; } $entry.='Offending command was: '.$query.'
'; - echo($entry); + \OC_Log::write('setup.mssql', $entry, \OC_Log::WARN); } } } @@ -687,7 +690,7 @@ class OC_Setup { $entry = ''; } $entry.='Offending command was: '.$query.'
'; - echo($entry); + \OC_Log::write('setup.mssql', $entry, \OC_Log::WARN); } else { $row = sqlsrv_fetch_array($result); @@ -698,7 +701,7 @@ class OC_Setup { $entry = ''; } $entry.='Offending command was: '.$query.'
'; - echo($entry); + \OC_Log::write('setup.mssql', $entry, \OC_Log::WARN); } else { if ($row == null) { $query = "USE [".$dbname."]; CREATE USER [".$name."] FOR LOGIN [".$name."];"; @@ -710,7 +713,7 @@ class OC_Setup { $entry = ''; } $entry.='Offending command was: '.$query.'
'; - echo($entry); + \OC_Log::write('setup.mssql', $entry, \OC_Log::WARN); } } @@ -723,7 +726,7 @@ class OC_Setup { $entry = ''; } $entry.='Offending command was: '.$query.'
'; - echo($entry); + \OC_Log::write('setup.mssql', $entry, \OC_Log::WARN); } } } @@ -739,12 +742,10 @@ class OC_Setup { $entry = ''; } $entry.='Offending command was: '.$query.'
'; - echo($entry); + \OC_Log::write('setup.mssql', $entry, \OC_Log::WARN); } } - // private static function setupMSSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username) { - private static function mssql_createDatabaseStructure($dbhost, $dbname, $dbuser, $dbpass, $dbtableprefix) { $connectionInfo = array( "Database" => $dbname, "UID" => $dbuser, "PWD" => $dbpass); @@ -760,7 +761,7 @@ class OC_Setup { $entry = ''; } $entry.='Offending command was: '.$query.'
'; - echo($entry); + \OC_Log::write('setup.mssql', $entry, \OC_Log::WARN); } else { $row = sqlsrv_fetch_array($result); @@ -771,7 +772,7 @@ class OC_Setup { $entry = ''; } $entry.='Offending command was: '.$query.'
'; - echo($entry); + \OC_Log::write('setup.mssql', $entry, \OC_Log::WARN); } else { if ($row == null) { OC_DB::createDbFromStructure('db_structure.xml'); From bcbf2e667badaae382911f9304d0811b17167af6 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Tue, 12 Feb 2013 01:17:01 +0100 Subject: [PATCH 010/103] fixing sql server syntax for database creation --- lib/setup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/setup.php b/lib/setup.php index 128c53269e..4a195c3450 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -733,7 +733,7 @@ class OC_Setup { } private static function mssql_createDatabase($dbname, $connection) { - $query = "CREATE DATABASE IF NOT EXISTS [".$dbname."];"; + $query = "CREATE DATABASE [".$dbname."];"; $result = sqlsrv_query($connection, $query); if (!$result || $result === false) { if ( ($errors = sqlsrv_errors() ) != null) { From 87b98dab25bec98c9018364a827427e2e9ac7782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 14 Feb 2013 11:56:41 +0100 Subject: [PATCH 011/103] use new filesystem to mount users home --- apps/files_versions/lib/versions.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index b54bc4a442..9f021bc4f8 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -57,9 +57,19 @@ class Storage { */ public function store($filename) { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { - list($uid, $filename) = self::getUidAndFilename($filename); - $files_view = new \OC\Files\View('/'.\OCP\User::getUser() .'/files'); - $users_view = new \OC\Files\View('/'.\OCP\User::getUser()); + $owner = \OC\Files\Filesystem::getOwner($filename); + if ( $owner != \OCP\User::getUser() ) { + $datadir = \OC_Config::getValue( "datadirectory", \OC::$SERVERROOT."/data" ); + \OC\Files\Filesystem::mount( '\OC\Files\Storage\Local', array('datadir'=>$datadir), '/'.$owner ); + $info = \OC\Files\Filesystem::getFileInfo($filename); + $id = $info['fileid']; + error_log("id: $id"); + $path = \OC\Files\Filesystem::getPath($id); + error_log("new path: $path"); + } + + $files_view = new \OC\Files\View('/'.$uid .'/files'); + $users_view = new \OC\Files\View('/'.$uid); //check if source file already exist as version to avoid recursions. // todo does this check work? From b05f05ec4a254ca5c2418fee473b648e52bb7e1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 14 Feb 2013 14:26:49 +0100 Subject: [PATCH 012/103] make store function static --- apps/files_versions/lib/versions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index 9f021bc4f8..c537fcf351 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -55,7 +55,7 @@ class Storage { /** * store a new version of a file. */ - public function store($filename) { + public static function store($filename) { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { $owner = \OC\Files\Filesystem::getOwner($filename); if ( $owner != \OCP\User::getUser() ) { From 78a3625ddfc67e7e6743a2ff6fd31e1566b174c8 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Thu, 14 Feb 2013 21:59:24 +0100 Subject: [PATCH 013/103] final adoptions for mssql connectivity --- lib/db.php | 7 +++++++ lib/files/cache/cache.php | 6 +++--- tests/lib/dbschema.php | 12 +++++++++--- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/lib/db.php b/lib/db.php index 3ccd51737a..903f76c8c0 100644 --- a/lib/db.php +++ b/lib/db.php @@ -404,6 +404,13 @@ class OC_DB { $query = self::prepare('SELECT lastval() AS id'); $row = $query->execute()->fetchRow(); return $row['id']; + } + if( $type == 'mssql' ) { + if($table !== null) { + $prefix = OC_Config::getValue( "dbtableprefix", "oc_" ); + $table = str_replace( '*PREFIX*', $prefix, $table ); + } + return self::$connection->lastInsertId($table); }else{ if($table !== null) { $prefix = OC_Config::getValue( "dbtableprefix", "oc_" ); diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php index dcb6e8fd39..b61f1de448 100644 --- a/lib/files/cache/cache.php +++ b/lib/files/cache/cache.php @@ -56,7 +56,7 @@ class Cache { } else { $query = \OC_DB::prepare('INSERT INTO `*PREFIX*storages`(`id`) VALUES(?)'); $query->execute(array($this->storageId)); - $this->numericId = \OC_DB::insertid('*PREFIX*filecache'); + $this->numericId = \OC_DB::insertid('*PREFIX*storages'); } } @@ -493,8 +493,8 @@ class Cache { */ public function getIncomplete() { $query = \OC_DB::prepare('SELECT `path` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `size` = -1 ORDER BY `fileid` DESC LIMIT 1'); - $query->execute(array($this->numericId)); - if ($row = $query->fetchRow()) { + $result = $query->execute(array($this->numericId)); + if ($row = $result->fetchRow()) { return $row['path']; } else { return false; diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php index fb60ce7dbb..e20a04ef7f 100644 --- a/tests/lib/dbschema.php +++ b/tests/lib/dbschema.php @@ -91,9 +91,15 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase { break; case 'pgsql': $sql = "SELECT tablename AS table_name, schemaname AS schema_name " - . "FROM pg_tables WHERE schemaname NOT LIKE 'pg_%' " - . "AND schemaname != 'information_schema' " - . "AND tablename = '".$table."'"; + . "FROM pg_tables WHERE schemaname NOT LIKE 'pg_%' " + . "AND schemaname != 'information_schema' " + . "AND tablename = '".$table."'"; + $query = OC_DB::prepare($sql); + $result = $query->execute(array()); + $exists = $result && $result->fetchOne(); + break; + case 'mssql': + $sql = "SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = '{$table}'"; $query = OC_DB::prepare($sql); $result = $query->execute(array()); $exists = $result && $result->fetchOne(); From 5a8e0f2048d6b2ef1d271fc8ca05c6d5bd338aed Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Sat, 16 Feb 2013 19:56:56 +0100 Subject: [PATCH 014/103] Extra position check for multiselect dropdown. Fix app/issues/575 --- core/js/multiselect.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/js/multiselect.js b/core/js/multiselect.js index 623c6e0f7e..bc4223feb6 100644 --- a/core/js/multiselect.js +++ b/core/js/multiselect.js @@ -266,8 +266,9 @@ } list.append(list.find('li.creator')); var pos=button.position(); - if($(document).height() > (button.offset().top+button.outerHeight() + list.children().length * button.height()) - || $(document).height()/2 > pos.top + if(($(document).height() > (button.offset().top+button.outerHeight() + list.children().length * button.height()) + && $(document).height() - button.offset().top > (button.offset().top+button.outerHeight() + list.children().length * button.height())) + || $(document).height()/2 > button.offset().top ) { list.css({ top:pos.top+button.outerHeight()-5, From efa024cc62a7a587ddb493287f0d8554c2342338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Mon, 18 Feb 2013 11:19:40 +0100 Subject: [PATCH 015/103] fix getUidAndFilename() function --- apps/files_versions/appinfo/app.php | 2 +- apps/files_versions/lib/versions.php | 67 +++++++++------------------- 2 files changed, 23 insertions(+), 46 deletions(-) diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php index f7c6989ce2..1fa63ced5e 100644 --- a/apps/files_versions/appinfo/app.php +++ b/apps/files_versions/appinfo/app.php @@ -12,5 +12,5 @@ OCP\Util::addscript('files_versions', 'versions'); // Listen to write signals OCP\Util::connectHook('OC_Filesystem', 'write', "OCA\Files_Versions\Hooks", "write_hook"); // Listen to delete and rename signals -OCP\Util::connectHook('OC_Filesystem', 'post-delete', "OCA\Files_Versions\Hooks", "remove_hook"); +OCP\Util::connectHook('OC_Filesystem', 'post_delete', "OCA\Files_Versions\Hooks", "remove_hook"); OCP\Util::connectHook('OC_Filesystem', 'rename', "OCA\Files_Versions\Hooks", "rename_hook"); diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index c537fcf351..1e9dc0a92a 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -35,48 +35,26 @@ class Storage { 'step' => 604800), ); - private static function getUidAndFilename($filename) - { - if (\OCP\App::isEnabled('files_sharing') - && substr($filename, 0, 7) == '/Shared' - && $source = \OCP\Share::getItemSharedWith('file', - substr($filename, 7), - \OC_Share_Backend_File::FORMAT_SHARED_STORAGE)) { - $filename = $source['path']; - $pos = strpos($filename, '/files', 1); - $uid = substr($filename, 1, $pos - 1); - $filename = substr($filename, $pos + 6); - } else { - $uid = \OCP\User::getUser(); + private static function getUidAndFilename($filename) { + $uid = \OC\Files\Filesystem::getOwner($filename); + if ( $uid != \OCP\User::getUser() ) { + $info = \OC\Files\Filesystem::getFileInfo($filename); + $ownerView = new \OC\Files\View('/'.$uid.'/files'); + $filename = $ownerView->getPath($info['fileid']); } return array($uid, $filename); } - + /** * store a new version of a file. */ public static function store($filename) { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { - $owner = \OC\Files\Filesystem::getOwner($filename); - if ( $owner != \OCP\User::getUser() ) { - $datadir = \OC_Config::getValue( "datadirectory", \OC::$SERVERROOT."/data" ); - \OC\Files\Filesystem::mount( '\OC\Files\Storage\Local', array('datadir'=>$datadir), '/'.$owner ); - $info = \OC\Files\Filesystem::getFileInfo($filename); - $id = $info['fileid']; - error_log("id: $id"); - $path = \OC\Files\Filesystem::getPath($id); - error_log("new path: $path"); - } + list($uid, $filename) = self::getUidAndFilename($filename); $files_view = new \OC\Files\View('/'.$uid .'/files'); $users_view = new \OC\Files\View('/'.$uid); - //check if source file already exist as version to avoid recursions. - // todo does this check work? - if ($users_view->file_exists($filename)) { - return false; - } - // check if filename is a directory if($files_view->is_dir($filename)) { return false; @@ -116,10 +94,10 @@ class Storage { */ public static function delete($filename) { list($uid, $filename) = self::getUidAndFilename($filename); - $versions_fileview = new \OC_FilesystemView('/'.$uid .'/files_versions'); + $versions_fileview = new \OC\Files\View('/'.$uid .'/files_versions'); $abs_path = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$filename.'.v'; - if( ($versions = self::getVersions($filename)) ) { + if( ($versions = self::getVersions($uid, $filename)) ) { if ( ($versionsSize = \OCP\Config::getAppValue('files_versions', 'size')) === null ) { $versionsSize = self::calculateSize($uid); } @@ -137,16 +115,15 @@ class Storage { public static function rename($oldpath, $newpath) { list($uid, $oldpath) = self::getUidAndFilename($oldpath); list($uidn, $newpath) = self::getUidAndFilename($newpath); - $versions_view = new \OC_FilesystemView('/'.$uid .'/files_versions'); - $files_view = new \OC_FilesystemView('/'.$uid .'/files'); + $versions_view = new \OC\Files\View('/'.$uid .'/files_versions'); + $files_view = new \OC\Files\View('/'.$uid .'/files'); $abs_newpath = \OCP\Config::getSystemValue('datadirectory').$versions_view->getAbsolutePath('').$newpath; if ( $files_view->is_dir($oldpath) && $versions_view->is_dir($oldpath) ) { $versions_view->rename($oldpath, $newpath); - } else if ( ($versions = Storage::getVersions($oldpath)) ) { + } else if ( ($versions = Storage::getVersions($uid, $oldpath)) ) { $info=pathinfo($abs_newpath); if(!file_exists($info['dirname'])) mkdir($info['dirname'], 0750, true); - $versions = Storage::getVersions($oldpath); foreach ($versions as $v) { $versions_view->rename($oldpath.'.v'.$v['version'], $newpath.'.v'.$v['version']); } @@ -187,14 +164,14 @@ 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( $filename, $count = 0 ) { + public static function getVersions($uid, $filename, $count = 0 ) { if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) { - list($uid, $filename) = self::getUidAndFilename($filename); - $versions_fileview = new \OC\Files\View('/' . \OCP\User::getUser() . '/files_versions'); + $versions_fileview = new \OC\Files\View('/' . $uid . '/files_versions'); $versionsName = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename); $versions = array(); @@ -203,7 +180,7 @@ class Storage { sort( $matches ); - $files_view = new \OC_FilesystemView('/'.$uid.'/files'); + $files_view = new \OC\Files\View('/'.$uid.'/files'); $local_file = $files_view->getLocalFile($filename); $local_file_md5 = \md5_file( $local_file ); @@ -254,7 +231,7 @@ class Storage { */ private static function calculateSize($uid) { if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) { - $versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions'); + $versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions'); $versionsRoot = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath(''); $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($versionsRoot), \RecursiveIteratorIterator::CHILD_FIRST); @@ -279,7 +256,7 @@ class Storage { */ private static function getAllVersions($uid) { if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) { - $versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions'); + $versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions'); $versionsRoot = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath(''); $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($versionsRoot), \RecursiveIteratorIterator::CHILD_FIRST); @@ -325,7 +302,7 @@ class Storage { private static function expire($filename, $versionsSize = null) { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { list($uid, $filename) = self::getUidAndFilename($filename); - $versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions'); + $versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions'); // get available disk space for user $quota = \OCP\Util::computerFileSize(\OC_Preferences::getValue($uid, 'files', 'quota')); @@ -344,7 +321,7 @@ class Storage { } // calculate available space for version history - $files_view = new \OC_FilesystemView('/'.$uid.'/files'); + $files_view = new \OC\Files\View('/'.$uid.'/files'); $rootInfo = $files_view->getFileInfo('/'); $free = $quota-$rootInfo['size']; // remaining free space for user if ( $free > 0 ) { @@ -360,7 +337,7 @@ class Storage { $versions_by_file = $result['by_file']; $all_versions = $result['all']; } else { - $all_versions = Storage::getVersions($filename); + $all_versions = Storage::getVersions($uid, $filename); $versions_by_file[$filename] = $all_versions; } From fde0a8b520203aee9800959847ff3bf4ec53250f Mon Sep 17 00:00:00 2001 From: VicDeo Date: Mon, 18 Feb 2013 13:22:43 +0300 Subject: [PATCH 016/103] Add Ability to the app to detect more details on the file --- apps/files/js/files.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 918182162d..8327460cca 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -162,9 +162,10 @@ $(document).ready(function() { var tr=$('tr').filterAttr('data-file',filename); var renaming=tr.data('renaming'); if(!renaming && !FileList.isLoading(filename)){ - var mime=$(this).parent().parent().data('mime'); - var type=$(this).parent().parent().data('type'); - var permissions = $(this).parent().parent().data('permissions'); + FileActions.currentFile = $(this).parent(); + var mime=FileActions.getCurrentMimeType(); + var type=FileActions.getCurrentType(); + var permissions = FileActions.getCurrentPermissions(); var action=FileActions.getDefault(mime,type, permissions); if(action){ event.preventDefault(); From 37352bba96033069107ca791b10b71c9505ca5d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Mon, 18 Feb 2013 18:16:19 +0100 Subject: [PATCH 017/103] close file handler after readdir() --- apps/files_trashbin/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index a2d4cc0a44..5d6b5d94e5 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -37,7 +37,7 @@ if ($dir) { ); } } - closedir($fullpath); + closedir($dirContent); } else { $dirlisting = false; From 2c78c5ccab763a74210ec8684f4582d0972e694e Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Mon, 18 Feb 2013 18:05:58 -0500 Subject: [PATCH 018/103] bug fix for issue 1739, two changes included: * fix typo in OC_Group_Database::DisplayNamesInGroup's SQL clause * check array_diff return value in OC_Group::displayNamesInGroups, when there is no difference between two arrays, it will return NULL, so we have to take care of it. --- lib/group.php | 15 ++++++++------- lib/group/database.php | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/group.php b/lib/group.php index 6afe144003..8c06ddc0fd 100644 --- a/lib/group.php +++ b/lib/group.php @@ -308,15 +308,16 @@ class OC_Group { * @return array with display names (Key) user ids (value) */ public static function displayNamesInGroups($gids, $search = '', $limit = -1, $offset = 0) { - $displayNames = array(); + $displayNames = array(); foreach ($gids as $gid) { // TODO Need to apply limits to groups as total - $displayNames = array_merge( - array_diff( - self::displayNamesInGroup($gid, $search, $limit, $offset), - $displayNames - ), - $displayNames); + $diff = array_diff( + self::displayNamesInGroup($gid, $search, $limit, $offset), + $displayNames + ); + if ($diff) { + $displayNames = array_merge($diff, $displayNames); + } } return $displayNames; } diff --git a/lib/group/database.php b/lib/group/database.php index 8816dd8169..93dc05c53a 100644 --- a/lib/group/database.php +++ b/lib/group/database.php @@ -225,7 +225,7 @@ class OC_Group_Database extends OC_Group_Backend { $stmt = OC_DB::prepare('SELECT `*PREFIX*users`.`uid`, `*PREFIX*users`.`displayname`' .' FROM `*PREFIX*users`' .' INNER JOIN `*PREFIX*group_user` ON `*PREFIX*group_user`.`uid` = `*PREFIX*users`.`uid`' - .' WHERE `gid` = ? AND `*PREFIX*group_user.uid` LIKE ?', + .' WHERE `gid` = ? AND `*PREFIX*group_user`.`uid` LIKE ?', $limit, $offset); $result = $stmt->execute(array($gid, $search.'%')); From 9a93db96421b712d8b8485478db4b84594571c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Tue, 19 Feb 2013 10:23:34 +0100 Subject: [PATCH 019/103] remove obsolete variables --- apps/files_trashbin/templates/part.list.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/apps/files_trashbin/templates/part.list.php b/apps/files_trashbin/templates/part.list.php index fe8a71f44e..2de0d7ee91 100644 --- a/apps/files_trashbin/templates/part.list.php +++ b/apps/files_trashbin/templates/part.list.php @@ -1,12 +1,8 @@ 200) $relative_date_color = 200; $name = str_replace('+', '%20', urlencode($file['name'])); $name = str_replace('%2F', '/', $name); From 51cef9d8f06586a4e7d4353cb5d7cc3fcddcf97a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Tue, 19 Feb 2013 10:24:21 +0100 Subject: [PATCH 020/103] allow user to delete selected files from the trash bin permanently --- apps/files_trashbin/ajax/delete.php | 52 ++++++++++++++++++------- apps/files_trashbin/js/trash.js | 30 ++++++++++++-- apps/files_trashbin/templates/index.php | 7 ++++ 3 files changed, 72 insertions(+), 17 deletions(-) diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index 7a6bd1342e..d922fafeb2 100644 --- a/apps/files_trashbin/ajax/delete.php +++ b/apps/files_trashbin/ajax/delete.php @@ -3,22 +3,46 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); -$file = $_REQUEST['file']; +$files = $_REQUEST['files']; +$dirlisting = $_REQUEST['dirlisting']; +$list = explode(';', $files); -$path_parts = pathinfo($file); -if ($path_parts['dirname'] == '.') { - $delimiter = strrpos($file, '.d'); - $filename = substr($file, 0, $delimiter); - $timestamp = substr($file, $delimiter+2); -} else { - $filename = $file; - $timestamp = null; +if (!is_array($list)){ + $list = array($list); } -if (OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp)) { - OCP\JSON::success(array("data" => array("filename" => $file))); -} else { +$error = array(); +$success = array(); + +$i = 0; +foreach ($list as $file) { + if ( $dirlisting=='0') { + $delimiter = strrpos($file, '.d'); + $filename = substr($file, 0, $delimiter); + $timestamp = substr($file, $delimiter+2); + } else { + $filename = $file; + $timestamp = null; + } + + if(OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp)) { + $success[$i]['filename'] = $file; + $success[$i]['timestamp'] = $timestamp; + $i++; + } else { + $error[] = $filename; + } +} + +if ( $error ) { + $filelist = ''; + foreach ( $error as $e ) { + $filelist .= $e.', '; + } $l = OC_L10N::get('files_trashbin'); - OCP\JSON::error(array("data" => array("message" => $l->t("Couldn't delete %s permanently", array($file))))); + $message = $l->t("Couldn't restore %s", array(rtrim($filelist, ', '))); + OCP\JSON::error(array("data" => array("message" => $message, + "success" => $success, "error" => $error))); +} else { + OCP\JSON::success(array("data" => array("success" => $success))); } - diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index 6c810e4c2b..1f4be9f15e 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -34,7 +34,7 @@ $(document).ready(function() { deleteAction[0].outerHTML = newHTML; $.post(OC.filePath('files_trashbin','ajax','delete.php'), - {file:tr.attr('data-file') }, + {files:tr.attr('data-file') }, function(result){ if ( result.status == 'success' ) { var row = document.getElementById(result.data.filename); @@ -88,7 +88,7 @@ $(document).ready(function() { } } processSelection(); - }); + }); $('.undelete').click('click',function(event) { var spinner = ''; @@ -113,7 +113,31 @@ $(document).ready(function() { } }); }); - + + $('.delete').click('click',function(event) { + console.log("delete selected"); + var spinner = ''; + var files=getSelectedFiles('file'); + var fileslist=files.join(';'); + var dirlisting=getSelectedFiles('dirlisting')[0]; + + for (var i in files) { + var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date"); + deleteAction[0].innerHTML = deleteAction[0].innerHTML+spinner; + } + + $.post(OC.filePath('files_trashbin','ajax','delete.php'), + {files:fileslist, dirlisting:dirlisting}, + function(result){ + for (var i = 0; i < result.data.success.length; i++) { + var row = document.getElementById(result.data.success[i].filename); + row.parentNode.removeChild(row); + } + if (result.status != 'success') { + OC.dialogs.alert(result.data.message, 'Error'); + } + }); + }); }); diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php index c3e51b4bec..c948c94d55 100644 --- a/apps/files_trashbin/templates/index.php +++ b/apps/files_trashbin/templates/index.php @@ -25,6 +25,13 @@ t( 'Deleted' ); ?> + + + t('Delete')?> + <?php echo $l->t('Delete')?>" /> + + From 815e964362192483989113af5c48d947084b5512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Tue, 19 Feb 2013 11:49:41 +0100 Subject: [PATCH 021/103] use instead of --- apps/files_trashbin/ajax/undelete.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php index 6320c1d082..57f6281674 100644 --- a/apps/files_trashbin/ajax/undelete.php +++ b/apps/files_trashbin/ajax/undelete.php @@ -3,8 +3,8 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); -$files = $_REQUEST['files']; -$dirlisting = $_REQUEST['dirlisting']; +$files = $_POST['files']; +$dirlisting = $_POST['dirlisting']; $list = explode(';', $files); $error = array(); From ac1b2a74ef33609e5ff99f020bf7d65e6bd56725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Tue, 19 Feb 2013 11:50:29 +0100 Subject: [PATCH 022/103] add missing paramenter to post request --- apps/files_trashbin/js/trash.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index 1f4be9f15e..1dfe09feca 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -34,7 +34,7 @@ $(document).ready(function() { deleteAction[0].outerHTML = newHTML; $.post(OC.filePath('files_trashbin','ajax','delete.php'), - {files:tr.attr('data-file') }, + {files:tr.attr('data-file'), dirlisting:tr.attr('data-dirlisting') }, function(result){ if ( result.status == 'success' ) { var row = document.getElementById(result.data.filename); From e6c39fc3e7e11b22c20df361fb891523e8c89a12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Tue, 19 Feb 2013 12:14:44 +0100 Subject: [PATCH 023/103] change $_REQUEST to $_POST; fix check if file was successfully deleted --- apps/files_trashbin/ajax/delete.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index d922fafeb2..7684d0465e 100644 --- a/apps/files_trashbin/ajax/delete.php +++ b/apps/files_trashbin/ajax/delete.php @@ -3,8 +3,8 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); -$files = $_REQUEST['files']; -$dirlisting = $_REQUEST['dirlisting']; +$files = $_POST['files']; +$dirlisting = $_POST['dirlisting']; $list = explode(';', $files); if (!is_array($list)){ @@ -24,8 +24,9 @@ foreach ($list as $file) { $filename = $file; $timestamp = null; } - - if(OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp)) { + + OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp); + if (!OCA\Files_Trashbin\Trashbin::file_exists($filename)) { $success[$i]['filename'] = $file; $success[$i]['timestamp'] = $timestamp; $i++; @@ -40,7 +41,7 @@ if ( $error ) { $filelist .= $e.', '; } $l = OC_L10N::get('files_trashbin'); - $message = $l->t("Couldn't restore %s", array(rtrim($filelist, ', '))); + $message = $l->t("Couldn't delete %s permanently", array(rtrim($filelist, ', '))); OCP\JSON::error(array("data" => array("message" => $message, "success" => $success, "error" => $error))); } else { From 7bfbfe6562a7dbcecdc05b60214a0da83760c4a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Tue, 19 Feb 2013 12:24:51 +0100 Subject: [PATCH 024/103] initialize $result --- apps/files_trashbin/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index 5d6b5d94e5..d0b3030dbf 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -16,6 +16,7 @@ OCP\Util::addScript('files', 'filelist'); $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : ''; +$result = array(); if ($dir) { $dirlisting = true; $view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_trashbin'); From 211e651d7222085b528cc6e9dc8d060d8ea6a60e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Tue, 19 Feb 2013 12:38:00 +0100 Subject: [PATCH 025/103] add timestamp to function call; fix trash.js to handle multiple delete operation at once --- apps/files_trashbin/ajax/delete.php | 2 +- apps/files_trashbin/js/trash.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index 7684d0465e..915ad9379f 100644 --- a/apps/files_trashbin/ajax/delete.php +++ b/apps/files_trashbin/ajax/delete.php @@ -26,7 +26,7 @@ foreach ($list as $file) { } OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp); - if (!OCA\Files_Trashbin\Trashbin::file_exists($filename)) { + if (!OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) { $success[$i]['filename'] = $file; $success[$i]['timestamp'] = $timestamp; $i++; diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index 1dfe09feca..fc38889dc3 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -36,11 +36,11 @@ $(document).ready(function() { $.post(OC.filePath('files_trashbin','ajax','delete.php'), {files:tr.attr('data-file'), dirlisting:tr.attr('data-dirlisting') }, function(result){ - if ( result.status == 'success' ) { - var row = document.getElementById(result.data.filename); + for (var i = 0; i < result.data.success.length; i++) { + var row = document.getElementById(result.data.success[i].filename); row.parentNode.removeChild(row); - } else { - deleteAction[0].outerHTML = oldHTML; + } + if (result.status != 'success') { OC.dialogs.alert(result.data.message, 'Error'); } }); From 686254ac1170dfd76d90b3cc6bd54761ae3d6908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Tue, 19 Feb 2013 18:45:46 +0100 Subject: [PATCH 026/103] move2trash() handles keyfiles --- apps/files_trashbin/lib/trash.php | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 8d54a471b4..1c0306ea90 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -37,7 +37,9 @@ class Trashbin { $view = new \OC_FilesystemView('/'. $user); if (!$view->is_dir('files_trashbin')) { $view->mkdir('files_trashbin'); - $view->mkdir("versions_trashbin"); + $view->mkdir("files_trashbin/files"); + $view->mkdir("files_trashbin/versions"); + $view->mkdir("files_trashbin/keyfiles"); } $path_parts = pathinfo($file_path); @@ -54,31 +56,38 @@ class Trashbin { } if ( ($trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size')) === null ) { - $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin')); - $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/versions_trashbin')); + $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin')); } - $trashbinSize += self::copy_recursive($file_path, 'files_trashbin/'.$deleted.'.d'.$timestamp, $view); + $trashbinSize += self::copy_recursive($file_path, 'files_trashbin/files/'.$deleted.'.d'.$timestamp, $view); - if ( $view->file_exists('files_trashbin/'.$deleted.'.d'.$timestamp) ) { + if ( $view->file_exists('files_trashbin/files/'.$deleted.'.d'.$timestamp) ) { $query = \OC_DB::prepare("INSERT INTO *PREFIX*files_trash (id,timestamp,location,type,mime,user) VALUES (?,?,?,?,?,?)"); $result = $query->execute(array($deleted, $timestamp, $location, $type, $mime, $user)); if ( !$result ) { // if file couldn't be added to the database than also don't store it in the trash bin. - $view->deleteAll('files_trashbin/'.$deleted.'.d'.$timestamp); + $view->deleteAll('files_trashbin/files/'.$deleted.'.d'.$timestamp); \OC_Log::write('files_trashbin', 'trash bin database couldn\'t be updated', \OC_log::ERROR); return; } - + + // Take core of file versions if ( \OCP\App::isEnabled('files_versions') ) { if ( $view->is_dir('files_versions'.$file_path) ) { $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_versions/'.$file_path)); - $view->rename('files_versions'.$file_path, 'versions_trashbin/'. $deleted.'.d'.$timestamp); + $view->rename('files_versions'.$file_path, 'files_trashbin/versions'. $deleted.'.d'.$timestamp); } else if ( $versions = \OCA\Files_Versions\Storage::getVersions($file_path) ) { foreach ($versions as $v) { $trashbinSize += $view->filesize('files_versions'.$v['path'].'.v'.$v['version']); - $view->rename('files_versions'.$v['path'].'.v'.$v['version'], 'versions_trashbin/'. $deleted.'.v'.$v['version'].'.d'.$timestamp); + $view->rename('files_versions'.$v['path'].'.v'.$v['version'], 'files_trashbin/versions'. $deleted.'.v'.$v['version'].'.d'.$timestamp); } } } + + // Take care of encryption keys + if ( \OCP\App::isEnabled('files_encryption') ) { + $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_encryption/keyfiles/'.$file_path)); + $view->rename('files_encryption'.$file_path, 'files_trashbin/keyfiles'. $deleted.'.d'.$timestamp); + } + } else { \OC_Log::write('files_trashbin', 'Couldn\'t move '.$file_path.' to the trash bin', \OC_log::ERROR); } From 94e5de8fd08c832b713a8162609857b36ed995f7 Mon Sep 17 00:00:00 2001 From: maelzx Date: Wed, 20 Feb 2013 11:14:24 +0800 Subject: [PATCH 027/103] Update apps/files_versions/js/versions.js Fix "All version..." button not clickable. Reason is Google Chrome blocking inline javascript execution. --- apps/files_versions/js/versions.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js index b9c5468981..dec222eefc 100644 --- a/apps/files_versions/js/versions.js +++ b/apps/files_versions/js/versions.js @@ -41,6 +41,10 @@ $(document).ready(function(){ } }); +function goToVersionPage(url){ + window.location(url); +} + function createVersionsDropdown(filename, files) { var historyUrl = OC.linkTo('files_versions', 'history.php') + '?path='+encodeURIComponent( $( '#dir' ).val() ).replace( /%2F/g, '/' )+'/'+encodeURIComponent( filename ); @@ -51,7 +55,7 @@ function createVersionsDropdown(filename, files) { html += ''; html += ''; html += ''; - html += ''; + html += ''; html += ''; if (filename) { @@ -60,6 +64,10 @@ function createVersionsDropdown(filename, files) { } else { $(html).appendTo($('thead .share')); } + + $("#makelink").click(function() { + goToVersionPage(historyUrl); + }); $.ajax({ type: 'GET', From 0efa4182dce6eb7179bea42646d7260bf5c97ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Wed, 20 Feb 2013 10:42:54 +0100 Subject: [PATCH 028/103] Update office icons --- core/img/filetypes/application-msexcel.png | Bin 566 -> 663 bytes core/img/filetypes/application-mspowerpoint.png | Bin 519 -> 588 bytes core/img/filetypes/application-msword.png | Bin 789 -> 651 bytes core/img/filetypes/ms-excel.png | Bin 566 -> 663 bytes core/img/filetypes/ms-powerpoint.png | Bin 519 -> 588 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/core/img/filetypes/application-msexcel.png b/core/img/filetypes/application-msexcel.png index abcd93689a08ec9bdbf0984927e8da06c043c7cd..b977d7e52e2446ea01201c5c7209ac3a05f12c9f 100644 GIT binary patch delta 586 zcmV-Q0=50N1eXPnSbqX3NklocDYX+w13v#(9+(pm2Y`rBgB%HhpcqAwHGjs)zZ?XCjE;`p19k(R zh%^AQQ54xysU+ocx$c#f61Z4HnT#3u~FR(3>BnZni zMIF4DouI8HiGLE0r61qOq|?OXaf-zv&N+-Rq*5sW^wy3hj(uOG^bs)oLvem;DeqBPUOyv)#?i1TLZHCN9Kvwz0{ z!ivH7eYDnSt%=2A>wqw@%zT~Z`SdfMzRS^BJ z!=Cg$-p{_`)8~(bp23S8QPm(KD5Y@DHU8z<8`%xd*nMfQgkjj=`WeH(aO(OYtZ954 zXQkn>)qqC0o}%!w}4`Ea$4)7Uae39IBRVMaGM#n)~*6p{Z{8)wK{v7Okjch YFP;~xM=H}_J^%m!07*qoM6N<$f_ye1d;kCd delta 488 zcmVNB_XI7v8TT#7Ow1h@d0(p>E&7-?^Da3<+o?9Yr;hHU^L<$w4{Ujg*A z6d~mYV4na=hT4Nz+_}SGTgW|Iir!%$;@OGkWI6+j0H}~K4RYR%!7y|zM`O@*K>rL{ z*&}x3lR**HrGL3dS>LXps$d!#`oaNnj-xjmOk?1;&##}sm`GeCN0T diff --git a/core/img/filetypes/application-mspowerpoint.png b/core/img/filetypes/application-mspowerpoint.png index b4aaad9a45c9abbee2d47611a6963101b64a8023..c4eff0387d5888c638ba09473ba6d2369f7b56f0 100644 GIT binary patch delta 509 zcmVc0NZemuCP!{KnLBw#02DSHvpDe1=-fW?3Ng5AEt$=eUHr|W3$NRou{cuWWZ z5uw>^0$|k%0DtL+XPmfskJ|1YAw9w!9`N)1^Aesr;y5Nr5-ODn)oOL|CGi}f9!&iV zwpK$khld0mrhJP0SsGJ2%QK?#~b*9`#}2tLg_ZGie66CL#xbVLc0R9ACGy zg;F4R?|%VdonY_%5#Y^V>wJE;&UQ@&9vJ)v^(=h-6CamO00000NkvXXu0mjfs-Eoo delta 440 zcmV;p0Z0DK1cwBWS$~;HL_t&-8KuF`i;ZC%#^KNN_Mn)f%tDevel8Uo4J*k?DQ0aJ z^A9LnrL3%3C~WN5$YQc$H%pW$gGLQyL1JpkIcMJYd*7ZXj%HzMG}o1Evk{qM>h`NE zz+T`Ka2#w*LZ)dFO#(?MSlX1maAeQ+6Ubb>cr;;~%eP+M^?!f5`RI)cGQXXsxIg=y z5wo`GiE-Y3S{hPhDtQ-w9NM{sDkc8u-IpO%f6#8G$P~7>QW$vub;x=+B2i=t%b8+& zVx09-h$>T9P85^ZpD~b-VdlnJ&fhynuh&Bol8{71@OWwlE2uJsC8}@zmNUn8GxOpz zRj)V3!2|oKY=2{m*K_k!?t-eJuuQc)2wIz;!;UIKBoeE25mZt~l_`=$H5|6|+aLxl zl_YEf1{>Q%7gX+6s4|5yBQ}3^T_6XQZDbP)D!Ze~6zXIkQ9PYpWTZE?jfD>%Y1@{S zwk5itNez`{Q)G&e7J>b9cP_BngG&!ti|rp2nJV;T@-f=;!?sT%?T|XKumYeSaefwW^{L9a%BKPWN%_+AW3au zXJt}lVPtu6$z?nM00JFJL_t(I%Z-z}Ym`wC#eetleaWK1%?39JF2tk}u~TET5D~Pq z5y4U`Q(1_uU@IbslJqwDUxI~_Mv;KvgDjhk*J`>E223Q5>T$=~mtA71q-jdG+eJhOAyBW^0k9Gk1+rX8)zFx((CG^&tDY>6 zXaS~Fy!WJON|Gdujg5^~VztuuYwG*C7#d7W9 zBvaKCiHb1>0OuUm+Jg=h>mU}wnW==^*H59qga&Rb)N$4z!&@=N{JxnHyopq{wsW38 zJ_`ziENbxN!Q7~zy`2+^{icJz19&NfyN}*|40$#_+nAgc0Tn?NR1^_|HTxs{4KuW6 zfJ-5SRlsmGi1+@A9R^APi7^fUIZAVkaTkc@K%5)HINKvSh`{DAZnb%%j-IN{00000 LNkvXXu0mjfaN;Ef delta 764 zcmVV>IRB3Hx05CZ(F*PqRHSv*;z5oCKC3HntbW?9;ba!ELWdKcKV{&h8 zWn^h#AVz6&Wp{6KYjYq?SRgVmFf@mDtj_=d0%S=;|_vLc8iNLz}aL#b^d)TJM%km?_ZAh2T*bt$StQHP+YFf>|7^dcw`frp?Uu!csZ z=BBH=x$e62oq695vx$%pJ@7Ka%=6MO6_IR0Z)`T?Ii0t>;LTE1q4O<77rbU5T2SRey|Sr-7|3_&C!O{lGfzzsdk` zqU{iC*VmzHxOL+yvGUw3n`&26oR1jKm3Tiq#mKj>bPr_7}{^=BEKDzdQeDp0IB(u@uggIDTLY)`NA56UA0bNaQQZsw3$|XJ5`P?qfEG zw-$h>{lfq>HP+!gM7~P!@j>%qz`bYvv^A$NfOSH3q``?2d5FB?suopykXS0!i^nocDYX+w13v#(9+(pm2Y`rBgB%HhpcqAwHGjs)zZ?XCjE;`p19k(R zh%^AQQ54xysU+ocx$c#f61Z4HnT#3u~FR(3>BnZni zMIF4DouI8HiGLE0r61qOq|?OXaf-zv&N+-Rq*5sW^wy3hj(uOG^bs)oLvem;DeqBPUOyv)#?i1TLZHCN9Kvwz0{ z!ivH7eYDnSt%=2A>wqw@%zT~Z`SdfMzRS^BJ z!=Cg$-p{_`)8~(bp23S8QPm(KD5Y@DHU8z<8`%xd*nMfQgkjj=`WeH(aO(OYtZ954 zXQkn>)qqC0o}%!w}4`Ea$4)7Uae39IBRVMaGM#n)~*6p{Z{8)wK{v7Okjch YFP;~xM=H}_J^%m!07*qoM6N<$f_ye1d;kCd delta 488 zcmVNB_XI7v8TT#7Ow1h@d0(p>E&7-?^Da3<+o?9Yr;hHU^L<$w4{Ujg*A z6d~mYV4na=hT4Nz+_}SGTgW|Iir!%$;@OGkWI6+j0H}~K4RYR%!7y|zM`O@*K>rL{ z*&}x3lR**HrGL3dS>LXps$d!#`oaNnj-xjmOk?1;&##}sm`GeCN0T diff --git a/core/img/filetypes/ms-powerpoint.png b/core/img/filetypes/ms-powerpoint.png index b4aaad9a45c9abbee2d47611a6963101b64a8023..c4eff0387d5888c638ba09473ba6d2369f7b56f0 100644 GIT binary patch delta 509 zcmVc0NZemuCP!{KnLBw#02DSHvpDe1=-fW?3Ng5AEt$=eUHr|W3$NRou{cuWWZ z5uw>^0$|k%0DtL+XPmfskJ|1YAw9w!9`N)1^Aesr;y5Nr5-ODn)oOL|CGi}f9!&iV zwpK$khld0mrhJP0SsGJ2%QK?#~b*9`#}2tLg_ZGie66CL#xbVLc0R9ACGy zg;F4R?|%VdonY_%5#Y^V>wJE;&UQ@&9vJ)v^(=h-6CamO00000NkvXXu0mjfs-Eoo delta 440 zcmV;p0Z0DK1cwBWS$~;HL_t&-8KuF`i;ZC%#^KNN_Mn)f%tDevel8Uo4J*k?DQ0aJ z^A9LnrL3%3C~WN5$YQc$H%pW$gGLQyL1JpkIcMJYd*7ZXj%HzMG}o1Evk{qM>h`NE zz+T`Ka2#w*LZ)dFO#(?MSlX1maAeQ+6Ubb>cr;;~%eP+M^?!f5`RI)cGQXXsxIg=y z5wo`GiE-Y3S{hPhDtQ-w9NM{sDkc8u-IpO%f6#8G$P~7>QW$vub;x=+B2i=t%b8+& zVx09-h$>T9P85^ZpD~b-VdlnJ&fhynuh&Bol8{71@OWwlE2uJsC8}@zmNUn8GxOpz zRj)V3!2|oKY=2{m*K_k!?t-eJuuQc)2wIz;!;UIKBoeE25mZt~l_`=$H5|6|+aLxl zl_YEf1{>Q%7gX+6s4|5yBQ}3^T_6XQZDbP)D!Ze~6zXIkQ9PYpWTZE?jfD>%Y1@{S zwk5itNez`{Q)G&e7J>b9cP_BngG&!ti|rp2nJV;T@-f=;!?sT%?T|XKumY Date: Wed, 20 Feb 2013 13:34:32 +0100 Subject: [PATCH 029/103] put all trash bin content in user/files_trashbin --- apps/files_trashbin/lib/trash.php | 64 +++++++++++++++---------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 1c0306ea90..b54805c63e 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -34,7 +34,7 @@ class Trashbin { */ public static function move2trash($file_path) { $user = \OCP\User::getUser(); - $view = new \OC_FilesystemView('/'. $user); + $view = new \OC\Files\View('/'. $user); if (!$view->is_dir('files_trashbin')) { $view->mkdir('files_trashbin'); $view->mkdir("files_trashbin/files"); @@ -87,7 +87,7 @@ class Trashbin { $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_encryption/keyfiles/'.$file_path)); $view->rename('files_encryption'.$file_path, 'files_trashbin/keyfiles'. $deleted.'.d'.$timestamp); } - + } else { \OC_Log::write('files_trashbin', 'Couldn\'t move '.$file_path.' to the trash bin', \OC_log::ERROR); } @@ -127,7 +127,6 @@ class Trashbin { if ( ($trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size')) === null ) { $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin')); - $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/versions_trashbin')); } if ( $timestamp ) { $query = \OC_DB::prepare('SELECT location,type FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?'); @@ -148,12 +147,12 @@ class Trashbin { $path_parts = pathinfo($filename); $result[] = array( 'location' => $path_parts['dirname'], - 'type' => $view->is_dir('/files_trashbin/'.$file) ? 'dir' : 'files', + 'type' => $view->is_dir('/files_trashbin/files/'.$file) ? 'dir' : 'files', ); $location = ''; } - $source = \OC_Filesystem::normalizePath('files_trashbin/'.$file); + $source = \OC_Filesystem::normalizePath('files_trashbin/files/'.$file); $target = \OC_Filesystem::normalizePath('files/'.$location.'/'.$filename); // we need a extension in case a file/dir with the same name already exists @@ -174,16 +173,16 @@ class Trashbin { $versionedFile = $file; } if ( $result[0]['type'] == 'dir' ) { - $trashbinSize -= self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.'versions_trashbin/'. $file)); - $view->rename(\OC_Filesystem::normalizePath('versions_trashbin/'. $file), \OC_Filesystem::normalizePath('files_versions/'.$location.'/'.$filename.$ext)); + $trashbinSize -= self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.'files_trashbin/versions/'. $file)); + $view->rename(\OC_Filesystem::normalizePath('files_trashbin/versions/'. $file), \OC_Filesystem::normalizePath('files_versions/'.$location.'/'.$filename.$ext)); } else if ( $versions = self::getVersionsFromTrash($versionedFile, $timestamp) ) { foreach ($versions as $v) { if ($timestamp ) { - $trashbinSize -= $view->filesize('versions_trashbin/'.$versionedFile.'.v'.$v.'.d'.$timestamp); - $view->rename('versions_trashbin/'.$versionedFile.'.v'.$v.'.d'.$timestamp, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v); + $trashbinSize -= $view->filesize('files_trashbin/versions/'.$versionedFile.'.v'.$v.'.d'.$timestamp); + $view->rename('files_trashbin/versions/'.$versionedFile.'.v'.$v.'.d'.$timestamp, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v); } else { - $trashbinSize -= $view->filesize('versions_trashbin/'.$versionedFile.'.v'.$v); - $view->rename('versions_trashbin/'.$versionedFile.'.v'.$v, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v); + $trashbinSize -= $view->filesize('files_trashbin/versions/'.$versionedFile.'.v'.$v); + $view->rename('files_trashbin/versions/'.$versionedFile.'.v'.$v, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v); } } } @@ -216,7 +215,6 @@ class Trashbin { if ( ($trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size')) === null ) { $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin')); - $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/versions_trashbin')); } if ( $timestamp ) { @@ -228,28 +226,28 @@ class Trashbin { } if ( \OCP\App::isEnabled('files_versions') ) { - if ($view->is_dir('versions_trashbin/'.$file)) { - $size += self::calculateSize(new \OC_Filesystemview('/'.$user.'/versions_trashbin/'.$file)); - $view->unlink('versions_trashbin/'.$file); + if ($view->is_dir('files_trashbin/versions/'.$file)) { + $size += self::calculateSize(new \OC_Filesystemview('/'.$user.'/files_trashbin/versions/'.$file)); + $view->unlink('files_trashbin/versions/'.$file); } else if ( $versions = self::getVersionsFromTrash($filename, $timestamp) ) { foreach ($versions as $v) { if ($timestamp ) { - $size += $view->filesize('/versions_trashbin/'.$filename.'.v'.$v.'.d'.$timestamp); - $view->unlink('/versions_trashbin/'.$filename.'.v'.$v.'.d'.$timestamp); + $size += $view->filesize('/files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp); + $view->unlink('/files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp); } else { - $size += $view->filesize('/versions_trashbin/'.$filename.'.v'.$v); - $view->unlink('/versions_trashbin/'.$filename.'.v'.$v); + $size += $view->filesize('/files_trashbin/versions/'.$filename.'.v'.$v); + $view->unlink('/files_trashbin/versions/'.$filename.'.v'.$v); } } } } - if ($view->is_dir('/files_trashbin/'.$file)) { - $size += self::calculateSize(new \OC_Filesystemview('/'.$user.'/files_trashbin/'.$file)); + if ($view->is_dir('/files_trashbin/files/'.$file)) { + $size += self::calculateSize(new \OC_Filesystemview('/'.$user.'/files_trashbin/files/'.$file)); } else { - $size += $view->filesize('/files_trashbin/'.$file); + $size += $view->filesize('/files_trashbin/files/'.$file); } - $view->unlink('/files_trashbin/'.$file); + $view->unlink('/files_trashbin/files/'.$file); $trashbinSize -= $size; \OCP\Config::setAppValue('files_trashbin', 'size', $trashbinSize); @@ -272,7 +270,7 @@ class Trashbin { $filename = $filename; } - $target = \OC_Filesystem::normalizePath('files_trashbin/'.$filename); + $target = \OC_Filesystem::normalizePath('files_trashbin/files/'.$filename); return $view->file_exists($target); } @@ -297,19 +295,19 @@ class Trashbin { $timestamp = $r['timestamp']; $filename = $r['id']; if ( $r['timestamp'] < $limit ) { - if ($view->is_dir('files_trashbin/'.$filename.'.d'.$timestamp)) { - $size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/files_trashbin/'.$filename.'.d'.$timestamp)); + if ($view->is_dir('files_trashbin/files/'.$filename.'.d'.$timestamp)) { + $size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/files_trashbin/files/'.$filename.'.d'.$timestamp)); } else { - $size += $view->filesize('files_trashbin/'.$filename.'.d'.$timestamp); + $size += $view->filesize('files_trashbin/files/'.$filename.'.d'.$timestamp); } - $view->unlink('files_trashbin/'.$filename.'.d'.$timestamp); + $view->unlink('files_trashbin/files/'.$filename.'.d'.$timestamp); if ($r['type'] == 'dir') { - $size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/versions_trashbin/'.$filename.'.d'.$timestamp)); - $view->unlink('versions_trashbin/'.$filename.'.d'.$timestamp); + $size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/files_trashbin/versions'.$filename.'.d'.$timestamp)); + $view->unlink('files_trashbin/versions'.$filename.'.d'.$timestamp); } else if ( $versions = self::getVersionsFromTrash($filename, $timestamp) ) { foreach ($versions as $v) { - $size += $view->filesize('versions_trashbin/'.$filename.'.v'.$v.'.d'.$timestamp); - $view->unlink('versions_trashbin/'.$filename.'.v'.$v.'.d'.$timestamp); + $size += $view->filesize('files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp); + $view->unlink('files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp); } } } @@ -373,7 +371,7 @@ class Trashbin { * @param $timestamp timestamp when the file was deleted */ private static function getVersionsFromTrash($filename, $timestamp) { - $view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/versions_trashbin'); + $view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_trashbin/versions'); $versionsName = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($filename); $versions = array(); if ($timestamp ) { From c49e73d43cd0e775ec653fa59811381b70e3efe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 20 Feb 2013 15:14:32 +0100 Subject: [PATCH 030/103] restore filekeys from trash bin --- apps/files_trashbin/lib/trash.php | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index b54805c63e..cde388015e 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -82,10 +82,11 @@ class Trashbin { } } - // Take care of encryption keys - if ( \OCP\App::isEnabled('files_encryption') ) { - $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_encryption/keyfiles/'.$file_path)); - $view->rename('files_encryption'.$file_path, 'files_trashbin/keyfiles'. $deleted.'.d'.$timestamp); + // Take care of encryption keys + $keyfile = \OC_Filesystem::normalizePath('files_encryption/keyfiles/'.$file_path.'.key'); + if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) { + $trashbinSize += $view->filesize($keyfile); + $view->rename($keyfile, 'files_trashbin/keyfiles/'. $deleted.'.d'.$timestamp); } } else { @@ -187,7 +188,18 @@ class Trashbin { } } } - + + // Take care of encryption keys + $keyfile = 'files_trashbin/keyfiles/'.$file; + if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) { + if ( $result[0]['type'] == 'dir' ) { + $trashbinSize -= self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile)); + } else { + $trashbinSize -= $view->filesize($keyfile); + } + $view->rename($keyfile, 'files_encryption/keyfiles/'. $location.'/'.$filename.'.key'); + } + if ( $timestamp ) { $query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?'); $query->execute(array($user,$filename,$timestamp)); From 3a364639b7649c12dcdd15e1c0344a35432aedc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 20 Feb 2013 15:17:32 +0100 Subject: [PATCH 031/103] use "|" as delimiter instead of ";", since "|" is not allowed in file/folder names --- apps/files_trashbin/ajax/delete.php | 6 +----- apps/files_trashbin/ajax/undelete.php | 2 +- apps/files_trashbin/js/trash.js | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index 915ad9379f..80382147eb 100644 --- a/apps/files_trashbin/ajax/delete.php +++ b/apps/files_trashbin/ajax/delete.php @@ -5,11 +5,7 @@ OCP\JSON::callCheck(); $files = $_POST['files']; $dirlisting = $_POST['dirlisting']; -$list = explode(';', $files); - -if (!is_array($list)){ - $list = array($list); -} +$list = explode('|', $files); $error = array(); $success = array(); diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php index 57f6281674..b76adb2a2a 100644 --- a/apps/files_trashbin/ajax/undelete.php +++ b/apps/files_trashbin/ajax/undelete.php @@ -5,7 +5,7 @@ OCP\JSON::callCheck(); $files = $_POST['files']; $dirlisting = $_POST['dirlisting']; -$list = explode(';', $files); +$list = explode('|', $files); $error = array(); $success = array(); diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index fc38889dc3..c8b862837a 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -93,7 +93,7 @@ $(document).ready(function() { $('.undelete').click('click',function(event) { var spinner = ''; var files=getSelectedFiles('file'); - var fileslist=files.join(';'); + var fileslist=files.join('|'); var dirlisting=getSelectedFiles('dirlisting')[0]; for (var i in files) { @@ -118,7 +118,7 @@ $(document).ready(function() { console.log("delete selected"); var spinner = ''; var files=getSelectedFiles('file'); - var fileslist=files.join(';'); + var fileslist=files.join('|'); var dirlisting=getSelectedFiles('dirlisting')[0]; for (var i in files) { From 273e1a146b27e197a7450589594edcb9131e3b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 20 Feb 2013 16:33:45 +0100 Subject: [PATCH 032/103] switch to json encoded file list --- apps/files_trashbin/ajax/delete.php | 2 +- apps/files_trashbin/ajax/undelete.php | 2 +- apps/files_trashbin/js/trash.js | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index 80382147eb..34f35c39cc 100644 --- a/apps/files_trashbin/ajax/delete.php +++ b/apps/files_trashbin/ajax/delete.php @@ -5,7 +5,7 @@ OCP\JSON::callCheck(); $files = $_POST['files']; $dirlisting = $_POST['dirlisting']; -$list = explode('|', $files); +$list = json_decode($files); $error = array(); $success = array(); diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php index b76adb2a2a..93f2aaf1fa 100644 --- a/apps/files_trashbin/ajax/undelete.php +++ b/apps/files_trashbin/ajax/undelete.php @@ -5,7 +5,7 @@ OCP\JSON::callCheck(); $files = $_POST['files']; $dirlisting = $_POST['dirlisting']; -$list = explode('|', $files); +$list = json_decode($files); $error = array(); $success = array(); diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index c8b862837a..3841a09814 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -6,9 +6,10 @@ $(document).ready(function() { var tr=$('tr').filterAttr('data-file', filename); var spinner = ''; var undeleteAction = $('tr').filterAttr('data-file',filename).children("td.date"); + var files = tr.attr('data-file'); undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner; $.post(OC.filePath('files_trashbin','ajax','undelete.php'), - {files:tr.attr('data-file'), dirlisting:tr.attr('data-dirlisting') }, + {files:JSON.stringify([files]), dirlisting:tr.attr('data-dirlisting') }, function(result){ for (var i = 0; i < result.data.success.length; i++) { var row = document.getElementById(result.data.success[i].filename); @@ -31,10 +32,11 @@ $(document).ready(function() { var deleteAction = $('tr').filterAttr('data-file',filename).children("td.date").children(".action.delete"); var oldHTML = deleteAction[0].outerHTML; var newHTML = ''; + var files = tr.attr('data-file'); deleteAction[0].outerHTML = newHTML; $.post(OC.filePath('files_trashbin','ajax','delete.php'), - {files:tr.attr('data-file'), dirlisting:tr.attr('data-dirlisting') }, + {files:JSON.stringify([files]), dirlisting:tr.attr('data-dirlisting') }, function(result){ for (var i = 0; i < result.data.success.length; i++) { var row = document.getElementById(result.data.success[i].filename); @@ -93,7 +95,7 @@ $(document).ready(function() { $('.undelete').click('click',function(event) { var spinner = ''; var files=getSelectedFiles('file'); - var fileslist=files.join('|'); + var fileslist = JSON.stringify(files); var dirlisting=getSelectedFiles('dirlisting')[0]; for (var i in files) { @@ -118,7 +120,7 @@ $(document).ready(function() { console.log("delete selected"); var spinner = ''; var files=getSelectedFiles('file'); - var fileslist=files.join('|'); + var fileslist = JSON.stringify(files); var dirlisting=getSelectedFiles('dirlisting')[0]; for (var i in files) { From 4b5a662e09e1f1d0b7885b546e7b278fe263be34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 20 Feb 2013 17:58:04 +0100 Subject: [PATCH 033/103] delete keyfiles if file in trash bin gets deleted permanently --- apps/files_trashbin/lib/trash.php | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index cde388015e..5c0cf36f5b 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -83,10 +83,14 @@ class Trashbin { } // Take care of encryption keys - $keyfile = \OC_Filesystem::normalizePath('files_encryption/keyfiles/'.$file_path.'.key'); - if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) { - $trashbinSize += $view->filesize($keyfile); - $view->rename($keyfile, 'files_trashbin/keyfiles/'. $deleted.'.d'.$timestamp); + $keyfile = \OC_Filesystem::normalizePath('files_encryption/keyfiles/'.$file_path); + if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile.'.key') ) { + if ( $view->is_dir('files'.$file_path) ) { + $trashbinSize -= self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile)); + } else { + $trashbinSize += $view->filesize($keyfile.'.key'); + } + $view->rename($keyfile.'.key', 'files_trashbin/keyfiles/'. $deleted.'.d'.$timestamp); } } else { @@ -190,7 +194,7 @@ class Trashbin { } // Take care of encryption keys - $keyfile = 'files_trashbin/keyfiles/'.$file; + $keyfile = \OC_Filesystem::normalizePath('files_trashbin/keyfiles/'.$file); if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) { if ( $result[0]['type'] == 'dir' ) { $trashbinSize -= self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile)); @@ -252,6 +256,17 @@ class Trashbin { } } } + } + + // Take care of encryption keys + $keyfile = \OC_Filesystem::normalizePath('files_trashbin/keyfiles/'.$file); + if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) { + if ( $result[0]['type'] == 'dir' ) { + $size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile)); + } else { + $size += $view->filesize($keyfile); + } + $view->unlink($keyfile); } if ($view->is_dir('/files_trashbin/files/'.$file)) { From 5ce6d1fb5774bdc7dacea4c853d5412f03004e0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 20 Feb 2013 18:00:15 +0100 Subject: [PATCH 034/103] reuse delete() function in expire() --- apps/files_trashbin/lib/trash.php | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 5c0cf36f5b..4d230449b5 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -322,27 +322,10 @@ class Trashbin { $timestamp = $r['timestamp']; $filename = $r['id']; if ( $r['timestamp'] < $limit ) { - if ($view->is_dir('files_trashbin/files/'.$filename.'.d'.$timestamp)) { - $size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/files_trashbin/files/'.$filename.'.d'.$timestamp)); - } else { - $size += $view->filesize('files_trashbin/files/'.$filename.'.d'.$timestamp); - } - $view->unlink('files_trashbin/files/'.$filename.'.d'.$timestamp); - if ($r['type'] == 'dir') { - $size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/files_trashbin/versions'.$filename.'.d'.$timestamp)); - $view->unlink('files_trashbin/versions'.$filename.'.d'.$timestamp); - } else if ( $versions = self::getVersionsFromTrash($filename, $timestamp) ) { - foreach ($versions as $v) { - $size += $view->filesize('files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp); - $view->unlink('files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp); - } - } + $size += self::delete($filename, $timestamp); } } - - $query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND timestampexecute(array($user,$limit)); - + $availableSpace = $availableSpace + $size; // if size limit for trash bin reached, delete oldest files in trash bin if ($availableSpace < 0) { @@ -355,8 +338,7 @@ class Trashbin { $availableSpace += $tmp; $size += $tmp; $i++; - } - + } } return $size; From 59fd9b2bd2a23e008a0be3180a423276d7a00f35 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Wed, 20 Feb 2013 19:09:58 +0100 Subject: [PATCH 035/103] 5.0.0 beta 1 --- lib/util.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/util.php b/lib/util.php index b2a4fce65a..636f3127f4 100755 --- a/lib/util.php +++ b/lib/util.php @@ -75,7 +75,7 @@ class OC_Util { public static function getVersion() { // hint: We only can count up. So the internal version number // of ownCloud 4.5 will be 4.90.0. This is not visible to the user - return array(4, 92, 10); + return array(4, 93, 10); } /** @@ -83,7 +83,7 @@ class OC_Util { * @return string */ public static function getVersionString() { - return '5.0 alpha 1'; + return '5.0 beta 1'; } /** From 5329c9ea31a1e0c31756d4faf8a9946965032012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 20 Feb 2013 19:18:34 +0100 Subject: [PATCH 036/103] update script which copies all trash bin related files to user/files_trashbin --- apps/files_trashbin/appinfo/update.php | 40 ++++++++++++++++++++++++++ apps/files_trashbin/appinfo/version | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 apps/files_trashbin/appinfo/update.php diff --git a/apps/files_trashbin/appinfo/update.php b/apps/files_trashbin/appinfo/update.php new file mode 100644 index 0000000000..b0bf79cc51 --- /dev/null +++ b/apps/files_trashbin/appinfo/update.php @@ -0,0 +1,40 @@ + Date: Wed, 20 Feb 2013 21:14:55 +0100 Subject: [PATCH 037/103] Add message when trouble sending email ref #1799 --- core/lostpassword/controller.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php index 3ef8eaf71a..fbcf4a87f2 100644 --- a/core/lostpassword/controller.php +++ b/core/lostpassword/controller.php @@ -44,7 +44,11 @@ class OC_Core_LostPassword_Controller { $msg = $tmpl->fetchPage(); $l = OC_L10N::get('core'); $from = OCP\Util::getDefaultEmailAddress('lostpassword-noreply'); - OC_Mail::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud'); + try { + OC_Mail::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud'); + } catch (Exception $e) { + OC_Template::printErrorPage( 'A problem occurs during sending the e-mail please contact your administrator.'); + } self::displayLostPasswordPage(false, true); } else { self::displayLostPasswordPage(true, false); From 3b9d9eea09bc7ccaad1445882f60ec2478bc34d0 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Wed, 20 Feb 2013 21:57:50 +0100 Subject: [PATCH 038/103] replaced for in loops with normal enumerating loops to fix #1803 --- apps/files/js/filelist.js | 4 ++-- apps/files_trashbin/js/trash.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index cc107656da..0bf1f79ab7 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -315,8 +315,8 @@ var FileList={ do_delete:function(files){ if(files.substr){ files=[files]; - } - for (var i in files) { + } + for (var i=0; i'; diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index 6c810e4c2b..23e5fb2fc9 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -88,7 +88,7 @@ $(document).ready(function() { } } processSelection(); - }); + }); $('.undelete').click('click',function(event) { var spinner = ''; @@ -96,7 +96,7 @@ $(document).ready(function() { var fileslist=files.join(';'); var dirlisting=getSelectedFiles('dirlisting')[0]; - for (var i in files) { + for (var i=0; i Date: Wed, 20 Feb 2013 22:17:04 +0100 Subject: [PATCH 039/103] some fixes for the keyfile handling --- apps/files_trashbin/lib/trash.php | 38 +++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 4d230449b5..f11e5c4cbf 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -69,7 +69,7 @@ class Trashbin { return; } - // Take core of file versions + // Take care of file versions if ( \OCP\App::isEnabled('files_versions') ) { if ( $view->is_dir('files_versions'.$file_path) ) { $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_versions/'.$file_path)); @@ -86,11 +86,12 @@ class Trashbin { $keyfile = \OC_Filesystem::normalizePath('files_encryption/keyfiles/'.$file_path); if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile.'.key') ) { if ( $view->is_dir('files'.$file_path) ) { - $trashbinSize -= self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile)); + $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile)); + $view->rename($keyfile, 'files_trashbin/keyfiles/'. $deleted.'.d'.$timestamp); } else { $trashbinSize += $view->filesize($keyfile.'.key'); + $view->rename($keyfile.'.key', 'files_trashbin/keyfiles/'. $deleted.'.key.d'.$timestamp); } - $view->rename($keyfile.'.key', 'files_trashbin/keyfiles/'. $deleted.'.d'.$timestamp); } } else { @@ -149,7 +150,7 @@ class Trashbin { $location = ''; } } else { - $path_parts = pathinfo($filename); + $path_parts = pathinfo($file); $result[] = array( 'location' => $path_parts['dirname'], 'type' => $view->is_dir('/files_trashbin/files/'.$file) ? 'dir' : 'files', @@ -193,15 +194,24 @@ class Trashbin { } } - // Take care of encryption keys - $keyfile = \OC_Filesystem::normalizePath('files_trashbin/keyfiles/'.$file); + // Take care of encryption keys TODO! Get '.key' in file between file name and delete date (also for permanent delete!) + $parts = pathinfo($file); + if ( $result[0]['type'] == 'dir' ) { + $keyfile = \OC_Filesystem::normalizePath('files_trashbin/keyfiles/'.$parts['dirname'].'/'.$filename); + } else { + $keyfile = \OC_Filesystem::normalizePath('files_trashbin/keyfiles/'.$parts['dirname'].'/'.$filename.'.key'); + } + if ($timestamp) { + $keyfile .= '.d'.$timestamp; + } if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) { if ( $result[0]['type'] == 'dir' ) { $trashbinSize -= self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile)); + $view->rename($keyfile, 'files_encryption/keyfiles/'. $location.'/'.$filename); } else { $trashbinSize -= $view->filesize($keyfile); + $view->rename($keyfile, 'files_encryption/keyfiles/'. $location.'/'.$filename.'.key'); } - $view->rename($keyfile, 'files_encryption/keyfiles/'. $location.'/'.$filename.'.key'); } if ( $timestamp ) { @@ -258,10 +268,18 @@ class Trashbin { } } - // Take care of encryption keys - $keyfile = \OC_Filesystem::normalizePath('files_trashbin/keyfiles/'.$file); + // Take care of encryption keys + $parts = pathinfo($file); + if ( $view->is_dir('/files_trashbin/files/'.$file) ) { + $keyfile = \OC_Filesystem::normalizePath('files_trashbin/keyfiles/'.$filename); + } else { + $keyfile = \OC_Filesystem::normalizePath('files_trashbin/keyfiles/'.$filename.'.key'); + } + if ($timestamp) { + $keyfile .= '.d'.$timestamp; + } if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) { - if ( $result[0]['type'] == 'dir' ) { + if ( $view->is_dir($keyfile) ) { $size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile)); } else { $size += $view->filesize($keyfile); From 2d6efae25714b188d4e689617b2e4ae8695b0317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 20 Feb 2013 22:19:23 +0100 Subject: [PATCH 040/103] update path to deleted files --- apps/files_trashbin/index.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index a2d4cc0a44..8f8d143b4d 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -9,7 +9,7 @@ OCP\Util::addScript('files', 'fileactions'); $tmpl = new OCP\Template('files_trashbin', 'index', 'user'); $user = \OCP\User::getUser(); -$view = new OC_Filesystemview('/'.$user.'/files_trashbin'); +$view = new OC_Filesystemview('/'.$user.'/files_trashbin/files'); OCP\Util::addStyle('files', 'files'); OCP\Util::addScript('files', 'filelist'); @@ -17,8 +17,7 @@ OCP\Util::addScript('files', 'filelist'); $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : ''; if ($dir) { - $dirlisting = true; - $view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_trashbin'); + $dirlisting = true; $fullpath = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($dir); $dirContent = opendir($fullpath); $i = 0; From c1847aaf5159200c38eb52693a2d2a84aef5cb5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 20 Feb 2013 22:32:44 +0100 Subject: [PATCH 041/103] change for loop to make it hopefully work with IE --- apps/files_trashbin/js/trash.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index 3841a09814..94fb4358d3 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -123,7 +123,7 @@ $(document).ready(function() { var fileslist = JSON.stringify(files); var dirlisting=getSelectedFiles('dirlisting')[0]; - for (var i in files) { + for (var i=0; i Date: Wed, 20 Feb 2013 23:11:38 +0100 Subject: [PATCH 042/103] WebDAV-Testing: - write the exception to the log - in case curl is missing we should return true as well --- lib/util.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/util.php b/lib/util.php index 636f3127f4..5d3286204e 100755 --- a/lib/util.php +++ b/lib/util.php @@ -562,7 +562,7 @@ class OC_Util { */ public static function isWebDAVWorking() { if (!function_exists('curl_init')) { - return; + return true; } $settings = array( @@ -578,6 +578,7 @@ class OC_Util { } catch(\Sabre_DAV_Exception_NotAuthenticated $e) { $return = true; } catch(\Exception $e) { + OC_Log::write('core', 'isWebDAVWorking: NO - Reason: '.$e, OC_Log::WARN); $return = false; } From fc1fba23040908fe5629f89b66a280aea5578520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 21 Feb 2013 00:02:52 +0100 Subject: [PATCH 043/103] don't show empty trash bin message for sub folders --- apps/files_trashbin/index.php | 1 + apps/files_trashbin/templates/index.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index 8f8d143b4d..d575c75f1a 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -94,6 +94,7 @@ $list->assign('disableDownloadActions', true); $tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage(), false); $tmpl->assign('fileList', $list->fetchPage(), false); $tmpl->assign('files', $files); +$tmpl->assign('dirlisting', $dirlisting); $tmpl->assign('dir', OC_Filesystem::normalizePath($view->getAbsolutePath())); $tmpl->printPage(); diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php index c3e51b4bec..b62ca0af00 100644 --- a/apps/files_trashbin/templates/index.php +++ b/apps/files_trashbin/templates/index.php @@ -5,7 +5,7 @@
- +
t('Nothing in here. Your trash bin is empty!')?>
From dcd93a53e4f2d158cb67493ce94ff164bac8f0e8 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Thu, 21 Feb 2013 00:15:58 +0100 Subject: [PATCH 044/103] [tx-robot] updated from transifex --- apps/files/l10n/de_DE.php | 4 +- apps/files/l10n/id.php | 4 + apps/files/l10n/pt_BR.php | 1 + apps/files_encryption/l10n/id.php | 7 +- apps/files_external/l10n/id.php | 36 +- apps/files_trashbin/l10n/de.php | 4 +- apps/files_trashbin/l10n/de_DE.php | 4 +- apps/files_trashbin/l10n/id.php | 13 +- apps/files_versions/l10n/id.php | 8 + apps/user_ldap/l10n/de.php | 10 +- apps/user_ldap/l10n/de_DE.php | 4 +- apps/user_ldap/l10n/id.php | 55 +++ apps/user_ldap/l10n/pt_BR.php | 1 + core/l10n/de.php | 18 +- core/l10n/de_DE.php | 6 +- core/l10n/my_MM.php | 3 + l10n/af_ZA/files_trashbin.po | 30 +- l10n/ar/files_trashbin.po | 30 +- l10n/be/files_trashbin.po | 32 +- l10n/bg_BG/files_trashbin.po | 32 +- l10n/bn_BD/files_trashbin.po | 30 +- l10n/ca/files_trashbin.po | 32 +- l10n/cs_CZ/files_trashbin.po | 32 +- l10n/da/files_trashbin.po | 32 +- l10n/de/core.po | 25 +- l10n/de/files.po | 44 +-- l10n/de/files_trashbin.po | 37 +- l10n/de/lib.po | 13 +- l10n/de/settings.po | 16 +- l10n/de/user_ldap.po | 17 +- l10n/de/user_webdavauth.po | 6 +- l10n/de_DE/core.po | 13 +- l10n/de_DE/files.po | 49 +-- l10n/de_DE/files_trashbin.po | 37 +- l10n/de_DE/files_versions.po | 6 +- l10n/de_DE/lib.po | 11 +- l10n/de_DE/settings.po | 14 +- l10n/de_DE/user_ldap.po | 11 +- l10n/de_DE/user_webdavauth.po | 6 +- l10n/el/files_trashbin.po | 32 +- l10n/eo/files_trashbin.po | 30 +- l10n/es/files_trashbin.po | 32 +- l10n/es/settings.po | 19 +- l10n/es_AR/files_trashbin.po | 32 +- l10n/et_EE/files_trashbin.po | 32 +- l10n/eu/files_trashbin.po | 32 +- l10n/fa/files_trashbin.po | 30 +- l10n/fi_FI/files_trashbin.po | 32 +- l10n/fr/files_trashbin.po | 32 +- l10n/gl/files_trashbin.po | 32 +- l10n/he/files_trashbin.po | 30 +- l10n/hi/files_trashbin.po | 30 +- l10n/hr/files_trashbin.po | 30 +- l10n/hu_HU/files_trashbin.po | 32 +- l10n/ia/files_trashbin.po | 30 +- l10n/id/core.po | 6 +- l10n/id/files.po | 50 +-- l10n/id/files_encryption.po | 17 +- l10n/id/files_external.po | 65 +-- l10n/id/files_trashbin.po | 51 ++- l10n/id/files_versions.po | 23 +- l10n/id/lib.po | 60 +-- l10n/id/settings.po | 16 +- l10n/id/user_ldap.po | 227 +++++------ l10n/is/files_trashbin.po | 30 +- l10n/it/files_trashbin.po | 32 +- l10n/ja_JP/files_trashbin.po | 32 +- l10n/ka_GE/files_trashbin.po | 30 +- l10n/ko/files_trashbin.po | 30 +- l10n/ku_IQ/files_trashbin.po | 30 +- l10n/lb/files_trashbin.po | 30 +- l10n/lt_LT/files_trashbin.po | 30 +- l10n/lv/files_trashbin.po | 32 +- l10n/mk/files_trashbin.po | 30 +- l10n/ms_MY/files_trashbin.po | 30 +- l10n/my_MM/core.po | 594 ++++++++++++++++++++++++++++ l10n/my_MM/files.po | 315 +++++++++++++++ l10n/my_MM/files_encryption.po | 38 ++ l10n/my_MM/files_external.po | 120 ++++++ l10n/my_MM/files_sharing.po | 48 +++ l10n/my_MM/files_trashbin.po | 76 ++++ l10n/my_MM/files_versions.po | 65 +++ l10n/my_MM/lib.po | 253 ++++++++++++ l10n/my_MM/settings.po | 496 +++++++++++++++++++++++ l10n/my_MM/user_ldap.po | 309 +++++++++++++++ l10n/my_MM/user_webdavauth.po | 33 ++ l10n/nb_NO/files_trashbin.po | 30 +- l10n/nl/files_trashbin.po | 32 +- l10n/nn_NO/files_trashbin.po | 30 +- l10n/oc/files_trashbin.po | 30 +- l10n/pl/files_trashbin.po | 30 +- l10n/pl_PL/files_trashbin.po | 30 +- l10n/pt_BR/files.po | 47 +-- l10n/pt_BR/files_trashbin.po | 32 +- l10n/pt_BR/user_ldap.po | 6 +- l10n/pt_PT/files_trashbin.po | 32 +- l10n/ro/files_trashbin.po | 30 +- l10n/ru/files_trashbin.po | 32 +- l10n/ru_RU/files_trashbin.po | 32 +- l10n/si_LK/files_trashbin.po | 30 +- l10n/sk/files_trashbin.po | 32 +- l10n/sk_SK/files_trashbin.po | 32 +- l10n/sl/files_trashbin.po | 30 +- l10n/sr/files_trashbin.po | 30 +- l10n/sr@latin/files_trashbin.po | 30 +- l10n/sv/files_trashbin.po | 32 +- l10n/sw_KE/files_trashbin.po | 30 +- l10n/ta_LK/files_trashbin.po | 30 +- l10n/templates/core.pot | 4 +- l10n/templates/files.pot | 40 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_trashbin.pot | 28 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- l10n/th_TH/files_trashbin.po | 30 +- l10n/tr/files_trashbin.po | 32 +- l10n/uk/files_trashbin.po | 32 +- l10n/vi/files_trashbin.po | 32 +- l10n/zh_CN.GB2312/files_trashbin.po | 30 +- l10n/zh_CN/files_trashbin.po | 30 +- l10n/zh_HK/files_trashbin.po | 30 +- l10n/zh_TW/files_trashbin.po | 30 +- lib/l10n/de.php | 6 +- lib/l10n/de_DE.php | 4 +- lib/l10n/my_MM.php | 3 + settings/l10n/de.php | 10 +- settings/l10n/de_DE.php | 8 +- settings/l10n/es.php | 1 + settings/l10n/id.php | 1 + 134 files changed, 4224 insertions(+), 1230 deletions(-) create mode 100644 core/l10n/my_MM.php create mode 100644 l10n/my_MM/core.po create mode 100644 l10n/my_MM/files.po create mode 100644 l10n/my_MM/files_encryption.po create mode 100644 l10n/my_MM/files_external.po create mode 100644 l10n/my_MM/files_sharing.po create mode 100644 l10n/my_MM/files_trashbin.po create mode 100644 l10n/my_MM/files_versions.po create mode 100644 l10n/my_MM/lib.po create mode 100644 l10n/my_MM/settings.po create mode 100644 l10n/my_MM/user_ldap.po create mode 100644 l10n/my_MM/user_webdavauth.po create mode 100644 lib/l10n/my_MM.php diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php index 8d119afada..1462efdd5d 100644 --- a/apps/files/l10n/de_DE.php +++ b/apps/files/l10n/de_DE.php @@ -24,7 +24,7 @@ "replaced {new_name}" => "{new_name} wurde ersetzt", "undo" => "rückgängig machen", "replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}", -"perform delete operation" => "Führe das Löschen aus", +"perform delete operation" => "führe das Löschen aus", "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.", "File name cannot be empty." => "Der Dateiname darf nicht leer sein.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.", @@ -69,5 +69,5 @@ "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.", "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.", "Current scanning" => "Scanne", -"Upgrading filesystem cache..." => "Aktualisiere den Dateisystem-Cache" +"Upgrading filesystem cache..." => "Aktualisiere den Dateisystem-Cache..." ); diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php index 4c4e2e0f71..aff1933e56 100644 --- a/apps/files/l10n/id.php +++ b/apps/files/l10n/id.php @@ -19,6 +19,10 @@ "Name" => "Nama", "Size" => "Ukuran", "Modified" => "Dimodifikasi", +"1 folder" => "1 map", +"{count} folders" => "{count} map", +"1 file" => "1 berkas", +"{count} files" => "{count} berkas", "Upload" => "Unggah", "File handling" => "Penanganan berkas", "Maximum upload size" => "Ukuran unggah maksimum", diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php index 3a9dafcabf..eb66e15472 100644 --- a/apps/files/l10n/pt_BR.php +++ b/apps/files/l10n/pt_BR.php @@ -60,6 +60,7 @@ "Text file" => "Arquivo texto", "Folder" => "Pasta", "From link" => "Do link", +"Deleted files" => "Arquivos apagados", "Cancel upload" => "Cancelar upload", "Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!", "Download" => "Baixar", diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php index 3f9a6c7d07..6044348e72 100644 --- a/apps/files_encryption/l10n/id.php +++ b/apps/files_encryption/l10n/id.php @@ -1,4 +1,7 @@ "enkripsi", -"None" => "tidak ada" +"Encryption" => "Enkripsi", +"File encryption is enabled." => "Enkripsi berkas aktif.", +"The following file types will not be encrypted:" => "Tipe berkas berikut tidak akan dienkripsi:", +"Exclude the following file types from encryption:" => "Kecualikan tipe berkas berikut dari enkripsi:", +"None" => "Tidak ada" ); diff --git a/apps/files_external/l10n/id.php b/apps/files_external/l10n/id.php index 4b7850025f..ab2d2d365f 100644 --- a/apps/files_external/l10n/id.php +++ b/apps/files_external/l10n/id.php @@ -1,14 +1,26 @@ "akses diberikan", -"Grant access" => "berikan hak akses", -"Fill out all required fields" => "isi semua field yang dibutuhkan", -"External Storage" => "penyimpanan eksternal", -"Configuration" => "konfigurasi", -"Options" => "pilihan", -"Applicable" => "berlaku", -"None set" => "tidak satupun di set", -"All Users" => "semua pengguna", -"Groups" => "grup", -"Users" => "pengguna", -"Delete" => "hapus" +"Access granted" => "Akses diberikan", +"Error configuring Dropbox storage" => "Kesalahan dalam mengkonfigurasi penyimpanan Dropbox", +"Grant access" => "Berikan hak akses", +"Fill out all required fields" => "Isi semua field yang dibutuhkan", +"Please provide a valid Dropbox app key and secret." => "Masukkan kunci dan sandi aplikasi Dropbox yang benar.", +"Error configuring Google Drive storage" => "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive", +"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Peringatan: \"smbclient\" tidak terpasang. Mount direktori CIFS/SMB tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya.", +"Warning: 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." => "Peringatan: Dukungan FTP di PHP tidak aktif atau tidak terpasang. Mount direktori FTP tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya.", +"External Storage" => "Penyimpanan Eksternal", +"Mount point" => "Lokasi mount", +"Backend" => "Backend", +"Configuration" => "Konfigurasi", +"Options" => "Pilihan", +"Applicable" => "Berlaku", +"Add mount point" => "Tambah lokasi mount", +"None set" => "Tidak satupun di set", +"All Users" => "Semua Pengguna", +"Groups" => "Grup", +"Users" => "Pengguna", +"Delete" => "Hapus", +"Enable User External Storage" => "Aktifkan Penyimpanan Eksternal Pengguna", +"Allow users to mount their own external storage" => "Ijinkan pengguna untuk me-mount penyimpanan eksternal mereka", +"SSL root certificates" => "Sertifikat root SSL", +"Import Root Certificate" => "Impor Sertifikat Root" ); diff --git a/apps/files_trashbin/l10n/de.php b/apps/files_trashbin/l10n/de.php index 1271f5c313..54cd047813 100644 --- a/apps/files_trashbin/l10n/de.php +++ b/apps/files_trashbin/l10n/de.php @@ -1,8 +1,8 @@ "Konnte %s nicht permanent löschen", +"Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen", "Couldn't restore %s" => "Konnte %s nicht wiederherstellen", "perform restore operation" => "Wiederherstellung ausführen", -"delete file permanently" => "Datei permanent löschen", +"delete file permanently" => "Datei dauerhaft löschen", "Name" => "Name", "Deleted" => "gelöscht", "1 folder" => "1 Ordner", diff --git a/apps/files_trashbin/l10n/de_DE.php b/apps/files_trashbin/l10n/de_DE.php index 6d944b3580..cfa5469820 100644 --- a/apps/files_trashbin/l10n/de_DE.php +++ b/apps/files_trashbin/l10n/de_DE.php @@ -1,8 +1,8 @@ "Konnte %s nicht entgültig löschen", +"Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen", "Couldn't restore %s" => "Konnte %s nicht wiederherstellen", "perform restore operation" => "Wiederherstellung ausführen", -"delete file permanently" => "Datei entgültig löschen", +"delete file permanently" => "Datei dauerhaft löschen", "Name" => "Name", "Deleted" => "Gelöscht", "1 folder" => "1 Ordner", diff --git a/apps/files_trashbin/l10n/id.php b/apps/files_trashbin/l10n/id.php index 1a14d8b7c2..9d1ad64159 100644 --- a/apps/files_trashbin/l10n/id.php +++ b/apps/files_trashbin/l10n/id.php @@ -1,3 +1,14 @@ "nama" +"Couldn't delete %s permanently" => "Tidak dapat menghapus permanen %s", +"Couldn't restore %s" => "Tidak dapat memulihkan %s", +"perform restore operation" => "jalankan operasi pemulihan", +"delete file permanently" => "hapus berkas secara permanen", +"Name" => "Nama", +"Deleted" => "Dihapus", +"1 folder" => "1 map", +"{count} folders" => "{count} map", +"1 file" => "1 berkas", +"{count} files" => "{count} berkas", +"Nothing in here. Your trash bin is empty!" => "Tempat sampah anda kosong!", +"Restore" => "Pulihkan" ); diff --git a/apps/files_versions/l10n/id.php b/apps/files_versions/l10n/id.php index 6c553327c4..6e24a05cbb 100644 --- a/apps/files_versions/l10n/id.php +++ b/apps/files_versions/l10n/id.php @@ -1,5 +1,13 @@ "Tidak dapat mengembalikan: %s", +"success" => "sukses", +"File %s was reverted to version %s" => "Berkas %s telah dikembalikan ke versi %s", +"failure" => "gagal", +"File %s could not be reverted to version %s" => "Berkas %s gagal dikembalikan ke versi %s", +"No old versions available" => "Versi lama tidak tersedia", +"No path specified" => "Lokasi tidak ditentukan", "History" => "riwayat", +"Revert a file to a previous version by clicking on its revert button" => "Kembalikan berkas ke versi sebelumnya dengan mengklik tombol kembalikan", "Files Versioning" => "pembuatan versi file", "Enable" => "aktifkan" ); diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php index 182025e8fb..6217a6d482 100644 --- a/apps/user_ldap/l10n/de.php +++ b/apps/user_ldap/l10n/de.php @@ -12,7 +12,7 @@ "Do you really want to delete the current Server Configuration?" => "Wollen Sie die aktuelle Serverkonfiguration wirklich löschen?", "Confirm Deletion" => "Löschung bestätigen", "Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Warnung: Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren.", -"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Warnung: Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte deinen Systemadministrator das Modul zu installieren.", +"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Warnung: Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte Deinen Systemadministrator das Modul zu installieren.", "Server configuration" => "Serverkonfiguration", "Add Server Configuration" => "Serverkonfiguration hinzufügen", "Host" => "Host", @@ -38,12 +38,12 @@ "When unchecked, this configuration will be skipped." => "Konfiguration wird übersprungen wenn deaktiviert", "Port" => "Port", "Backup (Replica) Host" => "Backup Host (Kopie)", -"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Gib einen optionalen Backup Host an. Es muss sich um eine kopie des Haupt LDAP/AD Servers handeln.", +"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Gib einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln.", "Backup (Replica) Port" => "Backup Port", "Disable Main Server" => "Hauptserver deaktivieren", -"When switched on, ownCloud will only connect to the replica server." => "Wenn aktiviert wird ownCloud ausschließlich den Backupserver verwenden", +"When switched on, ownCloud will only connect to the replica server." => "Wenn aktiviert, wird ownCloud ausschließlich den Backupserver verwenden.", "Use TLS" => "Nutze TLS", -"Do not use it additionally for LDAPS connections, it will fail." => "Benutze es nicht zusätzlich für LDAPS Verbindungen, es wird scheitern.", +"Do not use it additionally for LDAPS connections, it will fail." => "Benutze es nicht zusammen mit LDAPS Verbindungen, es wird fehlschlagen.", "Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)", "Turn off SSL certificate validation." => "Schalte die SSL-Zertifikatsprüfung aus.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden.", @@ -55,7 +55,7 @@ "Base User Tree" => "Basis-Benutzerbaum", "One User Base DN per line" => "Ein Benutzer Base DN pro Zeile", "User Search Attributes" => "Benutzersucheigenschaften", -"Optional; one attribute per line" => "Optional, eine Eigenschaft pro Zeile", +"Optional; one attribute per line" => "Optional; eine Eigenschaft pro Zeile", "Group Display Name Field" => "Feld für den Anzeigenamen der Gruppe", "The LDAP attribute to use to generate the groups`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. ", "Base Group Tree" => "Basis-Gruppenbaum", diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php index 9bee0a219a..c88ed22b4f 100644 --- a/apps/user_ldap/l10n/de_DE.php +++ b/apps/user_ldap/l10n/de_DE.php @@ -43,7 +43,7 @@ "Disable Main Server" => "Hauptserver deaktivieren", "When switched on, ownCloud will only connect to the replica server." => "Wenn eingeschaltet wird sich die ownCloud nur mit dem Replikat-Server verbinden.", "Use TLS" => "Nutze TLS", -"Do not use it additionally for LDAPS connections, it will fail." => "Benutzen Sie es nicht zusätzlich für LDAPS Verbindungen, es wird fehlschlagen.", +"Do not use it additionally for LDAPS connections, it will fail." => "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen.", "Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)", "Turn off SSL certificate validation." => "Schalten Sie die SSL-Zertifikatsprüfung aus.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden.", @@ -55,7 +55,7 @@ "Base User Tree" => "Basis-Benutzerbaum", "One User Base DN per line" => "Ein Benutzer Base DN pro Zeile", "User Search Attributes" => "Benutzer-Suche Eigenschaften", -"Optional; one attribute per line" => "Optional; Ein Attribut pro Zeile", +"Optional; one attribute per line" => "Optional; ein Attribut pro Zeile", "Group Display Name Field" => "Feld für den Anzeigenamen der Gruppe", "The LDAP attribute to use to generate the groups`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. ", "Base Group Tree" => "Basis-Gruppenbaum", diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php index c07892386d..5912789c85 100644 --- a/apps/user_ldap/l10n/id.php +++ b/apps/user_ldap/l10n/id.php @@ -1,14 +1,69 @@ "Gagal menghapus konfigurasi server", +"The configuration is valid and the connection could be established!" => "Konfigurasi valid dan koneksi dapat dilakukan!", +"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurasi valid, tetapi Bind gagal. Silakan cek pengaturan server dan keamanan.", +"The configuration is invalid. Please look in the ownCloud log for further details." => "Konfigurasi salah. Silakan lihat log ownCloud untuk lengkapnya.", "Deletion failed" => "penghapusan gagal", +"Take over settings from recent server configuration?" => "Ambil alih pengaturan dari konfigurasi server saat ini?", +"Keep settings?" => "Biarkan pengaturan?", +"Cannot add server configuration" => "Gagal menambah konfigurasi server", +"Connection test succeeded" => "Tes koneksi sukses", +"Connection test failed" => "Tes koneksi gagal", +"Do you really want to delete the current Server Configuration?" => "Anda ingin menghapus Konfigurasi Server saat ini?", +"Confirm Deletion" => "Konfirmasi Penghapusan", +"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Peringatan:/b> Aplikasi user_ldap dan user_webdavauth tidak kompatibel. Anda mungkin akan mengalami kejadian yang tidak diharapkan. Silakan minta administrator sistem untuk menonaktifkan salah satunya.", +"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Peringatan: Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya.", +"Server configuration" => "Konfigurasi server", +"Add Server Configuration" => "Tambah Konfigurasi Server", "Host" => "host", +"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol dapat tidak ditulis, kecuali anda menggunakan SSL. Lalu jalankan dengan ldaps://", +"Base DN" => "Base DN", +"One Base DN per line" => "Satu Base DN per baris", +"You can specify Base DN for users and groups in the Advanced tab" => "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan", +"User DN" => "User DN", +"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN dari klien pengguna yang dengannya tautan akan diterapkan, mis. uid=agen,dc=contoh,dc=com. Untuk akses anonim, biarkan DN dan kata sandi kosong.", "Password" => "kata kunci", +"For anonymous access, leave DN and Password empty." => "Untuk akses anonim, biarkan DN dan Kata sandi kosong.", "User Login Filter" => "gunakan saringan login", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definisikan filter untuk diterapkan, saat login dilakukan. %%uid menggantikan username saat login.", +"use %%uid placeholder, e.g. \"uid=%%uid\"" => "gunakan pengganti %%uid, mis. \"uid=%%uid\"", +"User List Filter" => "Daftar Filter Pengguna", +"Defines the filter to apply, when retrieving users." => "Definisikan filter untuk diterapkan saat menerima pengguna.", +"without any placeholder, e.g. \"objectClass=person\"." => "tanpa pengganti apapun, mis. \"objectClass=seseorang\".", "Group Filter" => "saringan grup", +"Defines the filter to apply, when retrieving groups." => "Definisikan filter untuk diterapkan saat menerima grup.", +"without any placeholder, e.g. \"objectClass=posixGroup\"." => "tanpa pengganti apapaun, mis. \"objectClass=posixGroup\".", +"Connection Settings" => "Pengaturan Koneksi", +"Configuration Active" => "Konfigurasi Aktif", +"When unchecked, this configuration will be skipped." => "Jika tidak dicentang, konfigurasi ini dilewati.", "Port" => "port", +"Backup (Replica) Host" => "Host Cadangan (Replika)", +"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Berikan pilihan host cadangan. Harus merupakan replika dari server LDAP/AD utama.", +"Backup (Replica) Port" => "Port Cadangan (Replika)", +"Disable Main Server" => "Nonaktifkan Server Utama", +"When switched on, ownCloud will only connect to the replica server." => "Saat diaktifkan, ownCloud hanya akan terhubung ke server replika.", "Use TLS" => "gunakan TLS", +"Do not use it additionally for LDAPS connections, it will fail." => "Jangan gunakan utamanya untuk koneksi LDAPS, koneksi akan gagal.", +"Case insensitve LDAP server (Windows)" => "Server LDAP dengan kapitalisasi tidak sensitif (Windows)", "Turn off SSL certificate validation." => "matikan validasi sertivikat SSL", +"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Jika koneksi hanya bekerja dengan opsi ini, impor sertifikat SSL server LDAP dari server ownCloud anda.", "Not recommended, use for testing only." => "tidak disarankan, gunakan hanya untuk pengujian.", "in seconds. A change empties the cache." => "dalam detik. perubahan mengosongkan cache", +"Directory Settings" => "Pengaturan Direktori", +"User Display Name Field" => "Bidang Tampilan Nama Pengguna", +"The LDAP attribute to use to generate the user`s ownCloud name." => "Atribut LDAP yang digunakan untuk menghasilkan nama pengguna ownCloud.", +"Base User Tree" => "Pohon Pengguna Dasar", +"One User Base DN per line" => "Satu Pengguna Base DN per baris", +"User Search Attributes" => "Atribut Pencarian Pengguna", +"Optional; one attribute per line" => "Pilihan; satu atribut per baris", +"Group Display Name Field" => "Bidang Tampilan Nama Grup", +"The LDAP attribute to use to generate the groups`s ownCloud name." => "Atribut LDAP yang digunakan untuk menghasilkan nama grup ownCloud.", +"Base Group Tree" => "Pohon Grup Dasar", +"One Group Base DN per line" => "Satu Grup Base DN per baris", +"Group Search Attributes" => "Atribut Pencarian Grup", +"Group-Member association" => "asosiasi Anggota-Grup", +"Special Attributes" => "Atribut Khusus", "in bytes" => "dalam bytes", +"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD.", "Help" => "bantuan" ); diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php index c86263d52a..e3d2da463c 100644 --- a/apps/user_ldap/l10n/pt_BR.php +++ b/apps/user_ldap/l10n/pt_BR.php @@ -4,6 +4,7 @@ "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuração é válida, mas o Bind falhou. Confira as configurações do servidor e as credenciais.", "The configuration is invalid. Please look in the ownCloud log for further details." => "A configuração é inválida. Leia o \"log\" do ownCloud para mais detalhes.", "Deletion failed" => "Remoção falhou", +"Take over settings from recent server configuration?" => "Tomar parámetros de recente configuração de servidor?", "Keep settings?" => "Manter ajustes?", "Cannot add server configuration" => "Não foi possível adicionar a configuração do servidor", "Connection test succeeded" => "Teste de conexão bem sucedido", diff --git a/core/l10n/de.php b/core/l10n/de.php index f1e892fee4..e60f061ff3 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -1,8 +1,8 @@ "Der Nutzer %s hat eine Datei mit dir geteilt", -"User %s shared a folder with you" => "%s hat ein Verzeichnis mit dir geteilt", -"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat die Datei \"%s\" mit dir geteilt. Sie ist hier zum Download verfügbar: %s", -"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat den Ordner \"%s\" mit dir geteilt. Er ist hier zum Download verfügbar: %s", +"User %s shared a file with you" => "Der Nutzer %s hat eine Datei mit Dir geteilt", +"User %s shared a folder with you" => "%s hat ein Verzeichnis mit Dir geteilt", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat die Datei \"%s\" mit Dir geteilt. Sie ist hier zum Download verfügbar: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat den Ordner \"%s\" mit Dir geteilt. Er ist hier zum Download verfügbar: %s", "Category type not provided." => "Kategorie nicht angegeben.", "No category to add?" => "Keine Kategorie hinzuzufügen?", "This category already exists: %s" => "Die Kategorie '%s' existiert bereits.", @@ -58,10 +58,10 @@ "Error while sharing" => "Fehler beim Teilen", "Error while unsharing" => "Fehler beim Aufheben der Teilung", "Error while changing permissions" => "Fehler beim Ändern der Rechte", -"Shared with you and the group {group} by {owner}" => "{owner} hat dies mit dir und der Gruppe {group} geteilt", -"Shared with you by {owner}" => "{owner} hat dies mit dir geteilt", +"Shared with you and the group {group} by {owner}" => "{owner} hat dies mit Dir und der Gruppe {group} geteilt", +"Shared with you by {owner}" => "{owner} hat dies mit Dir geteilt", "Share with" => "Teilen mit", -"Share with link" => "Über einen Link teilen", +"Share with link" => "Über einen Link freigegeben", "Password protect" => "Passwortschutz", "Password" => "Passwort", "Email link to person" => "Link per E-Mail verschicken", @@ -72,7 +72,7 @@ "No people found" => "Niemand gefunden", "Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt", "Shared in {item} with {user}" => "Für {user} in {item} freigegeben", -"Unshare" => "Teilung aufheben", +"Unshare" => "Freigabe aufheben", "can edit" => "kann bearbeiten", "access control" => "Zugriffskontrolle", "create" => "erstellen", @@ -109,7 +109,7 @@ "Security Warning" => "Sicherheitswarnung", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktiviere die PHP-Erweiterung für OpenSSL.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Konten zu übernehmen.", -"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Daten-Verzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.", +"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Datenverzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.", "For information how to properly configure your server, please see the documentation." => "Bitte lesen Sie die Dokumentation für Informationen, wie Sie Ihren Server konfigurieren.", "Create an admin account" => "Administrator-Konto anlegen", "Advanced" => "Fortgeschritten", diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php index 3430525894..9a975ddcb8 100644 --- a/core/l10n/de_DE.php +++ b/core/l10n/de_DE.php @@ -72,7 +72,7 @@ "No people found" => "Niemand gefunden", "Resharing is not allowed" => "Das Weiterverteilen ist nicht erlaubt", "Shared in {item} with {user}" => "Freigegeben in {item} von {user}", -"Unshare" => "Teilung aufheben", +"Unshare" => "Freigabe aufheben", "can edit" => "kann bearbeiten", "access control" => "Zugriffskontrolle", "create" => "erstellen", @@ -84,7 +84,7 @@ "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums", "Sending ..." => "Sende ...", "Email sent" => "Email gesendet", -"The update was unsuccessful. Please report this issue to the ownCloud community." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die ownCloud Gemeinschaft.", +"The update was unsuccessful. Please report this issue to the ownCloud community." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die ownCloud Community.", "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.", "ownCloud password reset" => "ownCloud-Passwort zurücksetzen", "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}", @@ -109,7 +109,7 @@ "Security Warning" => "Sicherheitshinweis", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktivieren Sie die PHP-Erweiterung für OpenSSL.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage, die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Ihr Konto zu übernehmen.", -"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Daten-Verzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.", +"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.", "For information how to properly configure your server, please see the documentation." => "Bitte lesen Sie die Dokumentation für Informationen, wie Sie Ihren Server konfigurieren.", "Create an admin account" => "Administrator-Konto anlegen", "Advanced" => "Fortgeschritten", diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php new file mode 100644 index 0000000000..8d5485a4a5 --- /dev/null +++ b/core/l10n/my_MM.php @@ -0,0 +1,3 @@ + "Apps" +); diff --git a/l10n/af_ZA/files_trashbin.po b/l10n/af_ZA/files_trashbin.po index 6fd4dfb314..a79bcc3940 100644 --- a/l10n/af_ZA/files_trashbin.po +++ b/l10n/af_ZA/files_trashbin.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-02-08 00:10+0100\n" -"PO-Revision-Date: 2013-02-07 23:11+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: af_ZA\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po index 174bde4c7f..74a6b21eb8 100644 --- a/l10n/ar/files_trashbin.po +++ b/l10n/ar/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "اسم" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/be/files_trashbin.po b/l10n/be/files_trashbin.po index c9d67b5a27..83bee5fbbd 100644 --- a/l10n/be/files_trashbin.po +++ b/l10n/be/files_trashbin.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:05+0100\n" -"PO-Revision-Date: 2013-01-31 16:03+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,7 +17,7 @@ msgstr "" "Language: be\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po index f46acd62e5..7ec18e9da4 100644 --- a/l10n/bg_BG/files_trashbin.po +++ b/l10n/bg_BG/files_trashbin.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-02-15 00:05+0100\n" -"PO-Revision-Date: 2013-02-14 17:50+0000\n" -"Last-Translator: Stefan Ilivanov \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: bg_BG\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Невъзможно изтриване на %s завинаги" @@ -28,35 +28,39 @@ msgstr "Невъзможно изтриване на %s завинаги" msgid "Couldn't restore %s" msgstr "Невъзможно възтановяване на %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "извършване на действие по възтановяване" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "изтриване на файла завинаги" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Име" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Изтрито" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 папка" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} папки" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 файл" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} файла" @@ -67,3 +71,7 @@ msgstr "Няма нищо. Кофата е празна!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Възтановяване" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po index b2577e03d2..643bed38fc 100644 --- a/l10n/bn_BD/files_trashbin.po +++ b/l10n/bn_BD/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: bn_BD\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "রাম" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "১টি ফোল্ডার" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} টি ফোল্ডার" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "১টি ফাইল" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} টি ফাইল" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po index 7f76de9cd6..7484f8e570 100644 --- a/l10n/ca/files_trashbin.po +++ b/l10n/ca/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 09:50+0000\n" -"Last-Translator: rogerc \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "No s'ha pogut esborrar permanentment %s" @@ -28,35 +28,39 @@ msgstr "No s'ha pogut esborrar permanentment %s" msgid "Couldn't restore %s" msgstr "No s'ha pogut restaurar %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "executa l'operació de restauració" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "esborra el fitxer permanentment" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nom" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Eliminat" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 carpeta" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} carpetes" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 fitxer" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} fitxers" @@ -67,3 +71,7 @@ msgstr "La paperera està buida!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Recupera" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po index 2052a13993..4241a18db3 100644 --- a/l10n/cs_CZ/files_trashbin.po +++ b/l10n/cs_CZ/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: Tomáš Chvátal \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: cs_CZ\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Nelze trvale odstranit %s" @@ -28,35 +28,39 @@ msgstr "Nelze trvale odstranit %s" msgid "Couldn't restore %s" msgstr "Nelze obnovit %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "provést obnovu" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "trvale odstranit soubor" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Název" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Smazáno" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 složka" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} složky" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 soubor" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} soubory" @@ -67,3 +71,7 @@ msgstr "Žádný obsah. Váš koš je prázdný." #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Obnovit" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po index 4e37f67f5b..6ebb48d541 100644 --- a/l10n/da/files_trashbin.po +++ b/l10n/da/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: Frederik Lassen \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Kunne ikke slette %s permanent" @@ -28,35 +28,39 @@ msgstr "Kunne ikke slette %s permanent" msgid "Couldn't restore %s" msgstr "Kunne ikke gendanne %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "udfør gendannelsesoperation" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "slet fil permanent" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Navn" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Slettet" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 mappe" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} mapper" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 fil" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} filer" @@ -67,3 +71,7 @@ msgstr "Intet at se her. Din papirkurv er tom!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Gendan" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/de/core.po b/l10n/de/core.po index bb7deec1e6..f59767d9eb 100644 --- a/l10n/de/core.po +++ b/l10n/de/core.po @@ -19,12 +19,13 @@ # Susi <>, 2012. # , 2012. # , 2012. +# Tristan , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" -"PO-Revision-Date: 2013-02-17 14:10+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:30+0000\n" "Last-Translator: Marcel Kühlhorn \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -36,26 +37,26 @@ msgstr "" #: ajax/share.php:85 #, php-format msgid "User %s shared a file with you" -msgstr "Der Nutzer %s hat eine Datei mit dir geteilt" +msgstr "Der Nutzer %s hat eine Datei mit Dir geteilt" #: ajax/share.php:87 #, php-format msgid "User %s shared a folder with you" -msgstr "%s hat ein Verzeichnis mit dir geteilt" +msgstr "%s hat ein Verzeichnis mit Dir geteilt" #: ajax/share.php:89 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" -msgstr "%s hat die Datei \"%s\" mit dir geteilt. Sie ist hier zum Download verfügbar: %s" +msgstr "%s hat die Datei \"%s\" mit Dir geteilt. Sie ist hier zum Download verfügbar: %s" #: ajax/share.php:91 #, php-format msgid "" "User %s shared the folder \"%s\" with you. It is available for download " "here: %s" -msgstr "%s hat den Ordner \"%s\" mit dir geteilt. Er ist hier zum Download verfügbar: %s" +msgstr "%s hat den Ordner \"%s\" mit Dir geteilt. Er ist hier zum Download verfügbar: %s" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -289,11 +290,11 @@ msgstr "Fehler beim Ändern der Rechte" #: js/share.js:168 msgid "Shared with you and the group {group} by {owner}" -msgstr "{owner} hat dies mit dir und der Gruppe {group} geteilt" +msgstr "{owner} hat dies mit Dir und der Gruppe {group} geteilt" #: js/share.js:170 msgid "Shared with you by {owner}" -msgstr "{owner} hat dies mit dir geteilt" +msgstr "{owner} hat dies mit Dir geteilt" #: js/share.js:175 msgid "Share with" @@ -301,7 +302,7 @@ msgstr "Teilen mit" #: js/share.js:180 msgid "Share with link" -msgstr "Über einen Link teilen" +msgstr "Über einen Link freigegeben" #: js/share.js:183 msgid "Password protect" @@ -345,7 +346,7 @@ msgstr "Für {user} in {item} freigegeben" #: js/share.js:313 msgid "Unshare" -msgstr "Teilung aufheben" +msgstr "Freigabe aufheben" #: js/share.js:325 msgid "can edit" @@ -402,7 +403,7 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 21:41+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -111,8 +111,8 @@ msgstr "Löschen" msgid "Rename" msgstr "Umbenennen" -#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407 -#: js/files.js:438 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 +#: js/files.js:439 msgid "Pending" msgstr "Ausstehend" @@ -170,74 +170,74 @@ msgstr "Ihr Speicherplatz ist voll, Dateien können nicht mehr aktualisiert oder msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ihr Speicherplatz ist fast aufgebraucht ({usedSpacePercent}%)" -#: js/files.js:224 +#: js/files.js:225 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern." -#: js/files.js:261 +#: js/files.js:262 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Deine Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist." -#: js/files.js:261 +#: js/files.js:262 msgid "Upload Error" msgstr "Fehler beim Upload" -#: js/files.js:272 +#: js/files.js:273 msgid "Close" msgstr "Schließen" -#: js/files.js:311 +#: js/files.js:312 msgid "1 file uploading" msgstr "Eine Datei wird hoch geladen" -#: js/files.js:314 js/files.js:369 js/files.js:384 +#: js/files.js:315 js/files.js:370 js/files.js:385 msgid "{count} files uploading" msgstr "{count} Dateien werden hochgeladen" -#: js/files.js:387 js/files.js:422 +#: js/files.js:388 js/files.js:423 msgid "Upload cancelled." msgstr "Upload abgebrochen." -#: js/files.js:496 +#: js/files.js:497 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen." -#: js/files.js:569 +#: js/files.js:570 msgid "URL cannot be empty." msgstr "Die URL darf nicht leer sein." -#: js/files.js:574 +#: js/files.js:575 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten." -#: js/files.js:948 templates/index.php:67 +#: js/files.js:949 templates/index.php:67 msgid "Name" msgstr "Name" -#: js/files.js:949 templates/index.php:78 +#: js/files.js:950 templates/index.php:78 msgid "Size" msgstr "Größe" -#: js/files.js:950 templates/index.php:80 +#: js/files.js:951 templates/index.php:80 msgid "Modified" msgstr "Bearbeitet" -#: js/files.js:969 +#: js/files.js:970 msgid "1 folder" msgstr "1 Ordner" -#: js/files.js:971 +#: js/files.js:972 msgid "{count} folders" msgstr "{count} Ordner" -#: js/files.js:979 +#: js/files.js:980 msgid "1 file" msgstr "1 Datei" -#: js/files.js:981 +#: js/files.js:982 msgid "{count} files" msgstr "{count} Dateien" diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po index 1aa1fd8154..eb4abe1788 100644 --- a/l10n/de/files_trashbin.po +++ b/l10n/de/files_trashbin.po @@ -5,14 +5,15 @@ # Translators: # I Robot , 2013. # Marcel Kühlhorn , 2013. +# Tristan , 2013. # , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" -"PO-Revision-Date: 2013-02-17 14:23+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,45 +21,49 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" -msgstr "Konnte %s nicht permanent löschen" +msgstr "Konnte %s nicht dauerhaft löschen" #: ajax/undelete.php:41 #, php-format msgid "Couldn't restore %s" msgstr "Konnte %s nicht wiederherstellen" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "Wiederherstellung ausführen" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" -msgstr "Datei permanent löschen" +msgstr "Datei dauerhaft löschen" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Name" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "gelöscht" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 Ordner" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} Ordner" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 Datei" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} Dateien" @@ -69,3 +74,7 @@ msgstr "Nichts zu löschen, der Papierkorb ist leer!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Wiederherstellen" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/de/lib.po b/l10n/de/lib.po index ba89f5ea5f..65f4c41119 100644 --- a/l10n/de/lib.po +++ b/l10n/de/lib.po @@ -10,13 +10,14 @@ # Phi Lieb <>, 2012. # , 2012. # , 2012. +# Tristan , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" -"PO-Revision-Date: 2013-02-17 14:10+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:10+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,7 +67,7 @@ msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen." #: helper.php:228 msgid "couldn't be determined" -msgstr "Konnte nicht festgestellt werden" +msgstr "konnte nicht festgestellt werden" #: json.php:28 msgid "Application is not enabled" @@ -102,7 +103,7 @@ msgstr "Setze Administrator Passwort" #: setup.php:40 msgid "Specify a data folder." -msgstr "Datei-Verzeichnis angeben" +msgstr "Datei-Verzeichnis angeben." #: setup.php:53 #, php-format @@ -171,7 +172,7 @@ msgstr "MySQL Benutzer '%s'@'%%' existiert bereits" #: setup.php:280 msgid "Drop this user from MySQL." -msgstr "Lösche diesen Benutzer von MySQL." +msgstr "Lösche diesen Benutzer aus MySQL." #: setup.php:553 setup.php:585 #, php-format diff --git a/l10n/de/settings.po b/l10n/de/settings.po index 736ddb0719..9d27684620 100644 --- a/l10n/de/settings.po +++ b/l10n/de/settings.po @@ -26,9 +26,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" -"PO-Revision-Date: 2013-02-17 14:31+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 21:50+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -195,7 +195,7 @@ msgid "" "strongly suggest that you configure your webserver in a way that the data " "directory is no longer accessible or you move the data directory outside the" " webserver document root." -msgstr "Dein Datenverzeichnis und deine Datein sind vielleicht vom Internet aus erreichbar. Die .htaccess Datei, die ownCloud verwendet, arbeitet nicht richtig. Wir schlagen Dir dringend vor, dass du deinen Webserver so konfigurierst, dass das Datenverzeichnis nicht länger erreichbar ist oder, dass du dein Datenverzeichnis aus dem Dokumenten-root des Webservers bewegst." +msgstr "Dein Datenverzeichnis und Deine Datein sind vielleicht vom Internet aus erreichbar. Die .htaccess Datei, die ownCloud verwendet, arbeitet nicht richtig. Wir schlagen Dir dringend vor, dass Du Deinen Webserver so konfigurierst, dass das Datenverzeichnis nicht länger erreichbar ist oder, dass Du Dein Datenverzeichnis aus dem Dokumenten-root des Webservers bewegst." #: templates/admin.php:29 msgid "Setup Warning" @@ -246,7 +246,7 @@ msgid "" "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." -msgstr "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen." +msgstr "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Du alle Funktionen von ownCloud nutzen möchtest." #: templates/admin.php:89 msgid "Cron" @@ -278,7 +278,7 @@ msgstr "Aktiviere Sharing-API" #: templates/admin.php:132 msgid "Allow apps to use the Share API" -msgstr "Erlaube Apps die Nutzung der Sharing-API" +msgstr "Erlaube Apps die Nutzung der Share-API" #: templates/admin.php:139 msgid "Allow links" @@ -329,7 +329,7 @@ msgstr "Log" #: templates/admin.php:193 msgid "Log level" -msgstr "Logtiefe" +msgstr "Loglevel" #: templates/admin.php:220 msgid "More" @@ -404,7 +404,7 @@ msgstr "Du verwendest %s der verfügbaren %s" #: templates/personal.php:14 msgid "Get the apps to sync your files" -msgstr "Laden Sie die Apps zur Synchronisierung ihrer Daten herunter" +msgstr "Lade die Apps zur Synchronisierung Deiner Daten herunter" #: templates/personal.php:25 msgid "Show First Run Wizard again" diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po index 431c6be2ae..5bab82f9cb 100644 --- a/l10n/de/user_ldap.po +++ b/l10n/de/user_ldap.po @@ -12,13 +12,14 @@ # Phi Lieb <>, 2012. # Susi <>, 2012. # , 2012. +# Tristan , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" -"PO-Revision-Date: 2013-02-17 14:20+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:10+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -89,7 +90,7 @@ msgstr "Warnung: Die Anwendungen user_ldap und user_webdavauth sind inkom msgid "" "Warning: The PHP LDAP module is not installed, the backend will not " "work. Please ask your system administrator to install it." -msgstr "Warnung: Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte deinen Systemadministrator das Modul zu installieren." +msgstr "Warnung: Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte Deinen Systemadministrator das Modul zu installieren." #: templates/settings.php:15 msgid "Server configuration" @@ -203,7 +204,7 @@ msgstr "Backup Host (Kopie)" msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." -msgstr "Gib einen optionalen Backup Host an. Es muss sich um eine kopie des Haupt LDAP/AD Servers handeln." +msgstr "Gib einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln." #: templates/settings.php:60 msgid "Backup (Replica) Port" @@ -215,7 +216,7 @@ msgstr "Hauptserver deaktivieren" #: templates/settings.php:61 msgid "When switched on, ownCloud will only connect to the replica server." -msgstr "Wenn aktiviert wird ownCloud ausschließlich den Backupserver verwenden" +msgstr "Wenn aktiviert, wird ownCloud ausschließlich den Backupserver verwenden." #: templates/settings.php:62 msgid "Use TLS" @@ -223,7 +224,7 @@ msgstr "Nutze TLS" #: templates/settings.php:62 msgid "Do not use it additionally for LDAPS connections, it will fail." -msgstr "Benutze es nicht zusätzlich für LDAPS Verbindungen, es wird scheitern." +msgstr "Benutze es nicht zusammen mit LDAPS Verbindungen, es wird fehlschlagen." #: templates/settings.php:63 msgid "Case insensitve LDAP server (Windows)" @@ -273,7 +274,7 @@ msgstr "Benutzersucheigenschaften" #: templates/settings.php:71 templates/settings.php:74 msgid "Optional; one attribute per line" -msgstr "Optional, eine Eigenschaft pro Zeile" +msgstr "Optional; eine Eigenschaft pro Zeile" #: templates/settings.php:72 msgid "Group Display Name Field" diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po index 139f573438..d2653f1685 100644 --- a/l10n/de/user_webdavauth.po +++ b/l10n/de/user_webdavauth.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" -"PO-Revision-Date: 2013-02-17 13:50+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:10+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po index b471458f11..37875797f9 100644 --- a/l10n/de_DE/core.po +++ b/l10n/de_DE/core.po @@ -22,12 +22,13 @@ # Susi <>, 2013. # , 2012. # , 2012. +# Tristan , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-17 00:25+0100\n" -"PO-Revision-Date: 2013-02-16 23:00+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:30+0000\n" "Last-Translator: Marcel Kühlhorn \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" @@ -348,7 +349,7 @@ msgstr "Freigegeben in {item} von {user}" #: js/share.js:313 msgid "Unshare" -msgstr "Teilung aufheben" +msgstr "Freigabe aufheben" #: js/share.js:325 msgid "can edit" @@ -399,13 +400,13 @@ msgid "" "The update was unsuccessful. Please report this issue to the ownCloud " "community." -msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die ownCloud Gemeinschaft." +msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die ownCloud Community." #: js/update.js:18 msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet." -#: lostpassword/controller.php:47 +#: lostpassword/controller.php:48 msgid "ownCloud password reset" msgstr "ownCloud-Passwort zurücksetzen" @@ -506,7 +507,7 @@ msgstr "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage, d msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." -msgstr "Dein Daten-Verzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert." +msgstr "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert." #: templates/installation.php:32 msgid "" diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po index 192ed3dbb8..f6a58a85f8 100644 --- a/l10n/de_DE/files.po +++ b/l10n/de_DE/files.po @@ -28,13 +28,14 @@ # , 2012. # Thomas Müller <>, 2012. # , 2012. +# Tristan , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-17 00:24+0100\n" -"PO-Revision-Date: 2013-02-16 16:30+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:30+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -115,8 +116,8 @@ msgstr "Löschen" msgid "Rename" msgstr "Umbenennen" -#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407 -#: js/files.js:438 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 +#: js/files.js:439 msgid "Pending" msgstr "Ausstehend" @@ -150,7 +151,7 @@ msgstr "{old_name} wurde ersetzt durch {new_name}" #: js/filelist.js:322 msgid "perform delete operation" -msgstr "Führe das Löschen aus" +msgstr "führe das Löschen aus" #: js/files.js:52 msgid "'.' is an invalid file name." @@ -174,74 +175,74 @@ msgstr "Ihr Speicher ist voll. Daher können keine Dateien mehr aktualisiert ode msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)" -#: js/files.js:224 +#: js/files.js:225 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien einen Moment dauern." -#: js/files.js:261 +#: js/files.js:262 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist." -#: js/files.js:261 +#: js/files.js:262 msgid "Upload Error" msgstr "Fehler beim Upload" -#: js/files.js:272 +#: js/files.js:273 msgid "Close" msgstr "Schließen" -#: js/files.js:311 +#: js/files.js:312 msgid "1 file uploading" msgstr "1 Datei wird hochgeladen" -#: js/files.js:314 js/files.js:369 js/files.js:384 +#: js/files.js:315 js/files.js:370 js/files.js:385 msgid "{count} files uploading" msgstr "{count} Dateien wurden hochgeladen" -#: js/files.js:387 js/files.js:422 +#: js/files.js:388 js/files.js:423 msgid "Upload cancelled." msgstr "Upload abgebrochen." -#: js/files.js:496 +#: js/files.js:497 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Der Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen." -#: js/files.js:569 +#: js/files.js:570 msgid "URL cannot be empty." msgstr "Die URL darf nicht leer sein." -#: js/files.js:574 +#: js/files.js:575 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten" -#: js/files.js:948 templates/index.php:67 +#: js/files.js:949 templates/index.php:67 msgid "Name" msgstr "Name" -#: js/files.js:949 templates/index.php:78 +#: js/files.js:950 templates/index.php:78 msgid "Size" msgstr "Größe" -#: js/files.js:950 templates/index.php:80 +#: js/files.js:951 templates/index.php:80 msgid "Modified" msgstr "Bearbeitet" -#: js/files.js:969 +#: js/files.js:970 msgid "1 folder" msgstr "1 Ordner" -#: js/files.js:971 +#: js/files.js:972 msgid "{count} folders" msgstr "{count} Ordner" -#: js/files.js:979 +#: js/files.js:980 msgid "1 file" msgstr "1 Datei" -#: js/files.js:981 +#: js/files.js:982 msgid "{count} files" msgstr "{count} Dateien" @@ -337,4 +338,4 @@ msgstr "Scanne" #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." -msgstr "Aktualisiere den Dateisystem-Cache" +msgstr "Aktualisiere den Dateisystem-Cache..." diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po index 0a68526442..1b66b827f1 100644 --- a/l10n/de_DE/files_trashbin.po +++ b/l10n/de_DE/files_trashbin.po @@ -8,13 +8,14 @@ # Phillip Schichtel , 2013. # , 2013. # Susi <>, 2013. +# Tristan , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-17 00:24+0100\n" -"PO-Revision-Date: 2013-02-16 13:51+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,45 +23,49 @@ msgstr "" "Language: de_DE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" -msgstr "Konnte %s nicht entgültig löschen" +msgstr "Konnte %s nicht dauerhaft löschen" #: ajax/undelete.php:41 #, php-format msgid "Couldn't restore %s" msgstr "Konnte %s nicht wiederherstellen" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "Wiederherstellung ausführen" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" -msgstr "Datei entgültig löschen" +msgstr "Datei dauerhaft löschen" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Name" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Gelöscht" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 Ordner" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} Ordner" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 Datei" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} Dateien" @@ -71,3 +76,7 @@ msgstr "Nichts zu löschen, Ihr Papierkorb ist leer!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Wiederherstellen" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/de_DE/files_versions.po b/l10n/de_DE/files_versions.po index a9ddf034b6..e28090ad62 100644 --- a/l10n/de_DE/files_versions.po +++ b/l10n/de_DE/files_versions.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-17 00:24+0100\n" -"PO-Revision-Date: 2013-02-16 23:10+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:16+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po index 1d9413b7ea..1cbf04792d 100644 --- a/l10n/de_DE/lib.po +++ b/l10n/de_DE/lib.po @@ -13,13 +13,14 @@ # , 2013. # , 2012. # , 2012. +# Tristan , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-18 00:05+0100\n" -"PO-Revision-Date: 2013-02-16 23:30+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:20+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -165,7 +166,7 @@ msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits." #: setup.php:274 msgid "Drop this user from MySQL" -msgstr "Lösche diesen Benutzer von MySQL" +msgstr "Lösche diesen Benutzer aus MySQL" #: setup.php:279 #, php-format @@ -174,7 +175,7 @@ msgstr "MySQL Benutzer '%s'@'%%' existiert bereits" #: setup.php:280 msgid "Drop this user from MySQL." -msgstr "Lösche diesen Benutzer von MySQL." +msgstr "Lösche diesen Benutzer aus MySQL." #: setup.php:553 setup.php:585 #, php-format diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index ad5f7571a5..66515e2199 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -30,9 +30,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-19 00:05+0100\n" -"PO-Revision-Date: 2013-02-18 14:18+0000\n" -"Last-Translator: robN \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:30+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -236,7 +236,7 @@ msgid "" "\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8." -msgstr "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 benötigten Pakete auf ihrem System zu installieren." +msgstr "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen im Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 benötigten Pakete auf Ihrem System zu installieren." #: templates/admin.php:72 msgid "Internet connection not working" @@ -250,7 +250,7 @@ msgid "" "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." -msgstr "Dieser ownCloud Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie das einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen." +msgstr "Dieser ownCloud Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen." #: templates/admin.php:89 msgid "Cron" @@ -278,11 +278,11 @@ msgstr "Teilen" #: templates/admin.php:131 msgid "Enable Share API" -msgstr "Teilen-API aktivieren" +msgstr "Share-API aktivieren" #: templates/admin.php:132 msgid "Allow apps to use the Share API" -msgstr "Erlaube es Anwendungen, die Teilen-API zu benutzen" +msgstr "Erlaube es Anwendungen, die Share-API zu benutzen" #: templates/admin.php:139 msgid "Allow links" diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po index 90f63eae9c..ad21db5c68 100644 --- a/l10n/de_DE/user_ldap.po +++ b/l10n/de_DE/user_ldap.po @@ -15,13 +15,14 @@ # Susi <>, 2013. # , 2012. # , 2012. +# Tristan , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-19 00:05+0100\n" -"PO-Revision-Date: 2013-02-18 14:19+0000\n" -"Last-Translator: robN \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:20+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -226,7 +227,7 @@ msgstr "Nutze TLS" #: templates/settings.php:62 msgid "Do not use it additionally for LDAPS connections, it will fail." -msgstr "Benutzen Sie es nicht zusätzlich für LDAPS Verbindungen, es wird fehlschlagen." +msgstr "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen." #: templates/settings.php:63 msgid "Case insensitve LDAP server (Windows)" @@ -276,7 +277,7 @@ msgstr "Benutzer-Suche Eigenschaften" #: templates/settings.php:71 templates/settings.php:74 msgid "Optional; one attribute per line" -msgstr "Optional; Ein Attribut pro Zeile" +msgstr "Optional; ein Attribut pro Zeile" #: templates/settings.php:72 msgid "Group Display Name Field" diff --git a/l10n/de_DE/user_webdavauth.po b/l10n/de_DE/user_webdavauth.po index 3592cedb14..d9d63ec77e 100644 --- a/l10n/de_DE/user_webdavauth.po +++ b/l10n/de_DE/user_webdavauth.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-17 00:24+0100\n" -"PO-Revision-Date: 2013-02-16 14:00+0000\n" -"Last-Translator: Marcel Kühlhorn \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 22:13+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po index e8ac463bd2..0a7899ec9e 100644 --- a/l10n/el/files_trashbin.po +++ b/l10n/el/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: Dimitris M. \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \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" @@ -18,7 +18,7 @@ msgstr "" "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Αδύνατη η μόνιμη διαγραφή του %s" @@ -28,35 +28,39 @@ msgstr "Αδύνατη η μόνιμη διαγραφή του %s" msgid "Couldn't restore %s" msgstr "Αδυναμία επαναφοράς %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "εκτέλεση λειτουργία επαναφοράς" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "μόνιμη διαγραφή αρχείου" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Όνομα" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Διαγράφηκε" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 φάκελος" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} φάκελοι" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 αρχείο" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} αρχεία" @@ -67,3 +71,7 @@ msgstr "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είνα #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Επαναφορά" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po index ba5bf42fbc..199528ce61 100644 --- a/l10n/eo/files_trashbin.po +++ b/l10n/eo/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: eo\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nomo" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 dosierujo" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} dosierujoj" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 dosiero" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} dosierujoj" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Restaŭri" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po index a2db3d575e..3b4d185f45 100644 --- a/l10n/es/files_trashbin.po +++ b/l10n/es/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: msvladimir \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "No se puede eliminar %s permanentemente" @@ -28,35 +28,39 @@ msgstr "No se puede eliminar %s permanentemente" msgid "Couldn't restore %s" msgstr "No se puede restaurar %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "Restaurar" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "Eliminar archivo permanentemente" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nombre" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Eliminado" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 carpeta" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} carpetas" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 archivo" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} archivos" @@ -67,3 +71,7 @@ msgstr "Nada aqui. La papelera esta vacia!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Recuperar" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/es/settings.po b/l10n/es/settings.po index 468cd0acfc..a469e600fc 100644 --- a/l10n/es/settings.po +++ b/l10n/es/settings.po @@ -9,6 +9,7 @@ # , 2011-2012. # , 2011. # oSiNaReF <>, 2012. +# , 2013. # , 2012. # Raul Fernandez Garcia , 2012. # , 2012. @@ -20,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 19:31+0000\n" +"Last-Translator: pedro.navia \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -158,23 +159,23 @@ msgstr "Grupo admin" msgid "Delete" msgstr "Eliminar" -#: js/users.js:190 +#: js/users.js:191 msgid "add group" msgstr "" -#: js/users.js:351 +#: js/users.js:352 msgid "A valid username must be provided" msgstr "" -#: js/users.js:352 js/users.js:358 js/users.js:373 +#: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" msgstr "" -#: js/users.js:357 +#: js/users.js:358 msgid "A valid password must be provided" msgstr "" -#: personal.php:34 personal.php:35 +#: personal.php:29 personal.php:30 msgid "__language_name__" msgstr "Castellano" @@ -264,7 +265,7 @@ msgstr "" #: templates/admin.php:125 msgid "Sharing" -msgstr "" +msgstr "Compartiendo" #: templates/admin.php:131 msgid "Enable Share API" diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po index 138bd484b7..2f47326a19 100644 --- a/l10n/es_AR/files_trashbin.po +++ b/l10n/es_AR/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: cjtess \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \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" @@ -18,7 +18,7 @@ msgstr "" "Language: es_AR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "No fue posible borrar %s de manera permanente" @@ -28,35 +28,39 @@ msgstr "No fue posible borrar %s de manera permanente" msgid "Couldn't restore %s" msgstr "No se pudo restaurar %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "Restaurar" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "Borrar archivo de manera permanente" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nombre" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Borrado" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 directorio" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} directorios" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 archivo" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} archivos" @@ -67,3 +71,7 @@ msgstr "No hay nada acá. ¡La papelera está vacía!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Recuperar" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po index 72073ead87..2fdc8f21c9 100644 --- a/l10n/et_EE/files_trashbin.po +++ b/l10n/et_EE/files_trashbin.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-02-13 00:03+0100\n" -"PO-Revision-Date: 2013-02-12 18:01+0000\n" -"Last-Translator: Rivo Zängov \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \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" @@ -18,7 +18,7 @@ msgstr "" "Language: et_EE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "%s jäädavalt kustutamine ebaõnnestus" @@ -28,35 +28,39 @@ msgstr "%s jäädavalt kustutamine ebaõnnestus" msgid "Couldn't restore %s" msgstr "%s ei saa taastada" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "soorita taastamine" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "kustuta fail jäädavalt" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nimi" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Kustutatud" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 kaust" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} kausta" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 fail" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} faili" @@ -67,3 +71,7 @@ msgstr "Siin pole midagi. Sinu prügikast on tühi!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Taasta" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po index 405582e420..9f07920929 100644 --- a/l10n/eu/files_trashbin.po +++ b/l10n/eu/files_trashbin.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-02-13 00:03+0100\n" -"PO-Revision-Date: 2013-02-12 22:00+0000\n" -"Last-Translator: asieriko \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \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" @@ -18,7 +18,7 @@ msgstr "" "Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Ezin izan da %s betirako ezabatu" @@ -28,35 +28,39 @@ msgstr "Ezin izan da %s betirako ezabatu" msgid "Couldn't restore %s" msgstr "Ezin izan da %s berreskuratu" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "berreskuratu" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "ezabatu fitxategia betirako" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Izena" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Ezabatuta" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "karpeta bat" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} karpeta" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "fitxategi bat" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} fitxategi" @@ -67,3 +71,7 @@ msgstr "Ez dago ezer ez. Zure zakarrontzia hutsik dago!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Berrezarri" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po index 435d45e463..c565a07fd2 100644 --- a/l10n/fa/files_trashbin.po +++ b/l10n/fa/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "نام" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 پوشه" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{ شمار} پوشه ها" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 پرونده" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{ شمار } فایل ها" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "بازیابی" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po index e64f9fdafb..f733faca83 100644 --- a/l10n/fi_FI/files_trashbin.po +++ b/l10n/fi_FI/files_trashbin.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-02-15 00:05+0100\n" -"PO-Revision-Date: 2013-02-14 07:40+0000\n" -"Last-Translator: Jiri Grönroos \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: fi_FI\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Kohdetta %s ei voitu poistaa pysyvästi" @@ -28,35 +28,39 @@ msgstr "Kohdetta %s ei voitu poistaa pysyvästi" msgid "Couldn't restore %s" msgstr "Kohteen %s palautus epäonnistui" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "suorita palautustoiminto" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "poista tiedosto pysyvästi" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nimi" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Poistettu" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 kansio" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} kansiota" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 tiedosto" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} tiedostoa" @@ -67,3 +71,7 @@ msgstr "Tyhjää täynnä! Roskakorissa ei ole mitään." #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Palauta" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po index 7f4f4cbbf7..5ea1578792 100644 --- a/l10n/fr/files_trashbin.po +++ b/l10n/fr/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 09:50+0000\n" -"Last-Translator: Romain DEP. \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +19,7 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Impossible d'effacer %s de façon permanente" @@ -29,35 +29,39 @@ msgstr "Impossible d'effacer %s de façon permanente" msgid "Couldn't restore %s" msgstr "Impossible de restaurer %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "effectuer l'opération de restauration" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "effacer définitivement le fichier" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nom" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Effacé" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 dossier" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} dossiers" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 fichier" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} fichiers" @@ -68,3 +72,7 @@ msgstr "Il n'y a rien ici. Votre corbeille est vide !" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Restaurer" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po index 2f1e3e6d86..feb2788da9 100644 --- a/l10n/gl/files_trashbin.po +++ b/l10n/gl/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: mbouzada \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \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" @@ -18,7 +18,7 @@ msgstr "" "Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Non foi posíbel eliminar %s permanente" @@ -28,35 +28,39 @@ msgstr "Non foi posíbel eliminar %s permanente" msgid "Couldn't restore %s" msgstr "Non foi posíbel restaurar %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "realizar a operación de restauración" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "eliminar o ficheiro permanentemente" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nome" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Eliminado" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 cartafol" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} cartafoles" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 ficheiro" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} ficheiros" @@ -67,3 +71,7 @@ msgstr "Aquí non hai nada. O cesto do lixo está baleiro!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Restablecer" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po index 3ce0051e74..d21b9b5d62 100644 --- a/l10n/he/files_trashbin.po +++ b/l10n/he/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "שם" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "תיקייה אחת" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} תיקיות" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "קובץ אחד" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} קבצים" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/hi/files_trashbin.po b/l10n/hi/files_trashbin.po index a0b6e4cede..2f956fdfd7 100644 --- a/l10n/hi/files_trashbin.po +++ b/l10n/hi/files_trashbin.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-02-08 00:10+0100\n" -"PO-Revision-Date: 2013-02-07 23:11+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: hi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po index f7162d5dc4..afa3dc963a 100644 --- a/l10n/hr/files_trashbin.po +++ b/l10n/hr/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: hr\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Ime" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po index 45b1df8c92..07e77a3af0 100644 --- a/l10n/hu_HU/files_trashbin.po +++ b/l10n/hu_HU/files_trashbin.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-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 13:30+0000\n" -"Last-Translator: Laszlo Tornoci \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: hu_HU\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Nem sikerült %s végleges törlése" @@ -28,35 +28,39 @@ msgstr "Nem sikerült %s végleges törlése" msgid "Couldn't restore %s" msgstr "Nem sikerült %s visszaállítása" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "a visszaállítás végrehajtása" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "az állomány végleges törlése" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Név" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Törölve" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 mappa" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} mappa" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 fájl" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} fájl" @@ -67,3 +71,7 @@ msgstr "Itt nincs semmi. Az Ön szemetes mappája üres!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Visszaállítás" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po index adba7ebd96..2099d6718c 100644 --- a/l10n/ia/files_trashbin.po +++ b/l10n/ia/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: ia\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nomine" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/id/core.po b/l10n/id/core.po index 3ddaac2d13..ff57644e68 100644 --- a/l10n/id/core.po +++ b/l10n/id/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-13 00:03+0100\n" -"PO-Revision-Date: 2013-02-12 14:32+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 03:12+0000\n" "Last-Translator: I Robot \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -390,7 +390,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:47 +#: lostpassword/controller.php:48 msgid "ownCloud password reset" msgstr "reset password ownCloud" diff --git a/l10n/id/files.po b/l10n/id/files.po index 8acd0447cf..5dc41bb1f5 100644 --- a/l10n/id/files.po +++ b/l10n/id/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 03:12+0000\n" "Last-Translator: I Robot \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -93,8 +93,8 @@ msgstr "Hapus" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407 -#: js/files.js:438 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 +#: js/files.js:439 msgid "Pending" msgstr "Menunggu" @@ -152,76 +152,76 @@ msgstr "" msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:224 +#: js/files.js:225 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:261 +#: js/files.js:262 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Gagal mengunggah berkas anda karena berupa direktori atau mempunyai ukuran 0 byte" -#: js/files.js:261 +#: js/files.js:262 msgid "Upload Error" msgstr "Terjadi Galat Pengunggahan" -#: js/files.js:272 +#: js/files.js:273 msgid "Close" msgstr "tutup" -#: js/files.js:311 +#: js/files.js:312 msgid "1 file uploading" msgstr "" -#: js/files.js:314 js/files.js:369 js/files.js:384 +#: js/files.js:315 js/files.js:370 js/files.js:385 msgid "{count} files uploading" msgstr "" -#: js/files.js:387 js/files.js:422 +#: js/files.js:388 js/files.js:423 msgid "Upload cancelled." msgstr "Pengunggahan dibatalkan." -#: js/files.js:496 +#: js/files.js:497 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:569 +#: js/files.js:570 msgid "URL cannot be empty." msgstr "tautan tidak boleh kosong" -#: js/files.js:574 +#: js/files.js:575 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "" -#: js/files.js:948 templates/index.php:67 +#: js/files.js:949 templates/index.php:67 msgid "Name" msgstr "Nama" -#: js/files.js:949 templates/index.php:78 +#: js/files.js:950 templates/index.php:78 msgid "Size" msgstr "Ukuran" -#: js/files.js:950 templates/index.php:80 +#: js/files.js:951 templates/index.php:80 msgid "Modified" msgstr "Dimodifikasi" -#: js/files.js:969 +#: js/files.js:970 msgid "1 folder" -msgstr "" +msgstr "1 map" -#: js/files.js:971 +#: js/files.js:972 msgid "{count} folders" -msgstr "" +msgstr "{count} map" -#: js/files.js:979 +#: js/files.js:980 msgid "1 file" -msgstr "" +msgstr "1 berkas" -#: js/files.js:981 +#: js/files.js:982 msgid "{count} files" -msgstr "" +msgstr "{count} berkas" #: lib/helper.php:11 templates/index.php:18 msgid "Upload" diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po index 28191e4f23..7a7d4d5211 100644 --- a/l10n/id/files_encryption.po +++ b/l10n/id/files_encryption.po @@ -4,13 +4,14 @@ # # Translators: # , 2012. +# Widya Walesa , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-10 00:08+0100\n" -"PO-Revision-Date: 2013-02-09 23:09+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 03:12+0000\n" +"Last-Translator: w41l \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,20 +21,20 @@ msgstr "" #: templates/settings-personal.php:4 templates/settings.php:5 msgid "Encryption" -msgstr "enkripsi" +msgstr "Enkripsi" #: templates/settings-personal.php:7 msgid "File encryption is enabled." -msgstr "" +msgstr "Enkripsi berkas aktif." #: templates/settings-personal.php:11 msgid "The following file types will not be encrypted:" -msgstr "" +msgstr "Tipe berkas berikut tidak akan dienkripsi:" #: templates/settings.php:7 msgid "Exclude the following file types from encryption:" -msgstr "" +msgstr "Kecualikan tipe berkas berikut dari enkripsi:" #: templates/settings.php:12 msgid "None" -msgstr "tidak ada" +msgstr "Tidak ada" diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po index cdec2730ac..eb0c9646b7 100644 --- a/l10n/id/files_external.po +++ b/l10n/id/files_external.po @@ -4,13 +4,14 @@ # # Translators: # , 2012. +# Widya Walesa , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-11 23:22+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 03:12+0000\n" +"Last-Translator: w41l \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,102 +21,102 @@ msgstr "" #: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23 msgid "Access granted" -msgstr "akses diberikan" +msgstr "Akses diberikan" #: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86 msgid "Error configuring Dropbox storage" -msgstr "" +msgstr "Kesalahan dalam mengkonfigurasi penyimpanan Dropbox" #: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40 msgid "Grant access" -msgstr "berikan hak akses" +msgstr "Berikan hak akses" #: js/dropbox.js:73 js/google.js:72 msgid "Fill out all required fields" -msgstr "isi semua field yang dibutuhkan" +msgstr "Isi semua field yang dibutuhkan" #: js/dropbox.js:85 msgid "Please provide a valid Dropbox app key and secret." -msgstr "" +msgstr "Masukkan kunci dan sandi aplikasi Dropbox yang benar." #: js/google.js:26 js/google.js:73 js/google.js:78 msgid "Error configuring Google Drive storage" -msgstr "" +msgstr "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive" -#: lib/config.php:434 +#: lib/config.php:398 msgid "" "Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Peringatan: \"smbclient\" tidak terpasang. Mount direktori CIFS/SMB tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya." -#: lib/config.php:435 +#: lib/config.php:401 msgid "" "Warning: 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 "" +msgstr "Peringatan: Dukungan FTP di PHP tidak aktif atau tidak terpasang. Mount direktori FTP tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya." #: templates/settings.php:3 msgid "External Storage" -msgstr "penyimpanan eksternal" +msgstr "Penyimpanan Eksternal" #: templates/settings.php:8 templates/settings.php:22 msgid "Mount point" -msgstr "" +msgstr "Lokasi mount" #: templates/settings.php:9 msgid "Backend" -msgstr "" +msgstr "Backend" #: templates/settings.php:10 msgid "Configuration" -msgstr "konfigurasi" +msgstr "Konfigurasi" #: templates/settings.php:11 msgid "Options" -msgstr "pilihan" +msgstr "Pilihan" #: templates/settings.php:12 msgid "Applicable" -msgstr "berlaku" +msgstr "Berlaku" #: templates/settings.php:27 msgid "Add mount point" -msgstr "" +msgstr "Tambah lokasi mount" #: templates/settings.php:85 msgid "None set" -msgstr "tidak satupun di set" +msgstr "Tidak satupun di set" #: templates/settings.php:86 msgid "All Users" -msgstr "semua pengguna" +msgstr "Semua Pengguna" #: templates/settings.php:87 msgid "Groups" -msgstr "grup" +msgstr "Grup" #: templates/settings.php:95 msgid "Users" -msgstr "pengguna" +msgstr "Pengguna" #: templates/settings.php:108 templates/settings.php:109 -#: templates/settings.php:149 templates/settings.php:150 +#: templates/settings.php:144 templates/settings.php:145 msgid "Delete" -msgstr "hapus" +msgstr "Hapus" #: templates/settings.php:124 msgid "Enable User External Storage" -msgstr "" +msgstr "Aktifkan Penyimpanan Eksternal Pengguna" #: templates/settings.php:125 msgid "Allow users to mount their own external storage" -msgstr "" +msgstr "Ijinkan pengguna untuk me-mount penyimpanan eksternal mereka" -#: templates/settings.php:139 +#: templates/settings.php:136 msgid "SSL root certificates" -msgstr "" +msgstr "Sertifikat root SSL" -#: templates/settings.php:158 +#: templates/settings.php:154 msgid "Import Root Certificate" -msgstr "" +msgstr "Impor Sertifikat Root" diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po index 15be1a566a..2aae65540f 100644 --- a/l10n/id/files_trashbin.po +++ b/l10n/id/files_trashbin.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Widya Walesa , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -17,52 +18,60 @@ msgstr "" "Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" -msgstr "" +msgstr "Tidak dapat menghapus permanen %s" #: ajax/undelete.php:41 #, php-format msgid "Couldn't restore %s" -msgstr "" +msgstr "Tidak dapat memulihkan %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" -msgstr "" +msgstr "jalankan operasi pemulihan" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" +msgstr "hapus berkas secara permanen" + +#: js/trash.js:121 +msgid "Delete permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:151 templates/index.php:17 msgid "Name" -msgstr "nama" +msgstr "Nama" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" -msgstr "" +msgstr "Dihapus" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" -msgstr "" +msgstr "1 map" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" -msgstr "" +msgstr "{count} map" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" -msgstr "" +msgstr "1 berkas" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" -msgstr "" +msgstr "{count} berkas" #: templates/index.php:9 msgid "Nothing in here. Your trash bin is empty!" -msgstr "" +msgstr "Tempat sampah anda kosong!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" +msgstr "Pulihkan" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" msgstr "" diff --git a/l10n/id/files_versions.po b/l10n/id/files_versions.po index 490e0fc816..5bf91c3ed0 100644 --- a/l10n/id/files_versions.po +++ b/l10n/id/files_versions.po @@ -4,13 +4,14 @@ # # Translators: # , 2012. +# Widya Walesa , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-08 00:10+0100\n" -"PO-Revision-Date: 2013-02-07 23:11+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 03:00+0000\n" +"Last-Translator: w41l \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,33 +22,33 @@ msgstr "" #: ajax/rollbackVersion.php:15 #, php-format msgid "Could not revert: %s" -msgstr "" +msgstr "Tidak dapat mengembalikan: %s" #: history.php:40 msgid "success" -msgstr "" +msgstr "sukses" #: history.php:42 #, php-format msgid "File %s was reverted to version %s" -msgstr "" +msgstr "Berkas %s telah dikembalikan ke versi %s" #: history.php:49 msgid "failure" -msgstr "" +msgstr "gagal" #: history.php:51 #, php-format msgid "File %s could not be reverted to version %s" -msgstr "" +msgstr "Berkas %s gagal dikembalikan ke versi %s" #: history.php:68 msgid "No old versions available" -msgstr "" +msgstr "Versi lama tidak tersedia" #: history.php:73 msgid "No path specified" -msgstr "" +msgstr "Lokasi tidak ditentukan" #: js/versions.js:16 msgid "History" @@ -55,7 +56,7 @@ msgstr "riwayat" #: templates/history.php:20 msgid "Revert a file to a previous version by clicking on its revert button" -msgstr "" +msgstr "Kembalikan berkas ke versi sebelumnya dengan mengklik tombol kembalikan" #: templates/settings.php:3 msgid "Files Versioning" diff --git a/l10n/id/lib.po b/l10n/id/lib.po index 32d4cfd14e..12bb079d49 100644 --- a/l10n/id/lib.po +++ b/l10n/id/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-02-11 15:39+0100\n" -"PO-Revision-Date: 2013-02-11 14:40+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 03:12+0000\n" "Last-Translator: I Robot \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -19,27 +19,27 @@ msgstr "" "Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: app.php:339 +#: app.php:349 msgid "Help" msgstr "bantu" -#: app.php:346 +#: app.php:362 msgid "Personal" msgstr "perseorangan" -#: app.php:351 +#: app.php:373 msgid "Settings" msgstr "pengaturan" -#: app.php:356 +#: app.php:385 msgid "Users" msgstr "pengguna" -#: app.php:363 +#: app.php:398 msgid "Apps" msgstr "aplikasi" -#: app.php:365 +#: app.php:406 msgid "Admin" msgstr "admin" @@ -51,15 +51,15 @@ msgstr "download ZIP sedang dimatikan" msgid "Files need to be downloaded one by one." msgstr "file harus di unduh satu persatu" -#: files.php:203 files.php:228 +#: files.php:204 files.php:231 msgid "Back to Files" msgstr "kembali ke daftar file" -#: files.php:227 +#: files.php:228 msgid "Selected files too large to generate zip file." msgstr "file yang dipilih terlalu besar untuk membuat file zip" -#: helper.php:226 +#: helper.php:228 msgid "couldn't be determined" msgstr "" @@ -119,7 +119,7 @@ msgstr "" msgid "%s set the database host." msgstr "" -#: setup.php:126 setup.php:291 setup.php:336 +#: setup.php:126 setup.php:294 setup.php:339 msgid "PostgreSQL username and/or password not valid" msgstr "" @@ -127,7 +127,7 @@ msgstr "" msgid "You need to enter either an existing account or the administrator." msgstr "" -#: setup.php:149 setup.php:423 setup.php:489 +#: setup.php:149 setup.php:427 setup.php:494 msgid "Oracle username and/or password not valid" msgstr "" @@ -135,51 +135,51 @@ msgstr "" msgid "MySQL username and/or password not valid" msgstr "" -#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394 -#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529 -#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573 -#: setup.php:579 +#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397 +#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534 +#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578 +#: setup.php:584 #, php-format msgid "DB Error: \"%s\"" msgstr "" -#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395 -#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530 -#: setup.php:541 setup.php:557 setup.php:565 setup.php:574 +#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398 +#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535 +#: setup.php:546 setup.php:562 setup.php:570 setup.php:579 #, php-format msgid "Offending command was: \"%s\"" msgstr "" -#: setup.php:270 +#: setup.php:273 #, php-format msgid "MySQL user '%s'@'localhost' exists already." msgstr "" -#: setup.php:271 +#: setup.php:274 msgid "Drop this user from MySQL" msgstr "" -#: setup.php:276 +#: setup.php:279 #, php-format msgid "MySQL user '%s'@'%%' already exists" msgstr "" -#: setup.php:277 +#: setup.php:280 msgid "Drop this user from MySQL." msgstr "" -#: setup.php:548 setup.php:580 +#: setup.php:553 setup.php:585 #, php-format msgid "Offending command was: \"%s\", name: %s, password: %s" msgstr "" -#: setup.php:644 +#: setup.php:649 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." msgstr "" -#: setup.php:645 +#: setup.php:651 #, php-format msgid "Please double check the installation guides." msgstr "" @@ -236,16 +236,16 @@ msgstr "tahun kemarin" msgid "years ago" msgstr "beberapa tahun lalu" -#: updater.php:75 +#: updater.php:78 #, php-format msgid "%s is available. Get more information" msgstr "%s tersedia. dapatkan info lebih lanjut" -#: updater.php:77 +#: updater.php:81 msgid "up to date" msgstr "terbaru" -#: updater.php:80 +#: updater.php:84 msgid "updates check is disabled" msgstr "pengecekan pembaharuan sedang non-aktifkan" diff --git a/l10n/id/settings.po b/l10n/id/settings.po index 56cc39cb35..cd8cfdfc1d 100644 --- a/l10n/id/settings.po +++ b/l10n/id/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-14 00:05+0100\n" -"PO-Revision-Date: 2013-02-13 23:05+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 03:12+0000\n" "Last-Translator: I Robot \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -149,23 +149,23 @@ msgstr "Admin Grup" msgid "Delete" msgstr "Hapus" -#: js/users.js:190 +#: js/users.js:191 msgid "add group" msgstr "" -#: js/users.js:351 +#: js/users.js:352 msgid "A valid username must be provided" msgstr "" -#: js/users.js:352 js/users.js:358 js/users.js:373 +#: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" msgstr "" -#: js/users.js:357 +#: js/users.js:358 msgid "A valid password must be provided" msgstr "" -#: personal.php:34 personal.php:35 +#: personal.php:29 personal.php:30 msgid "__language_name__" msgstr "__language_name__" @@ -389,7 +389,7 @@ msgstr "" #: templates/personal.php:14 msgid "Get the apps to sync your files" -msgstr "" +msgstr "Dapatkan aplikasi untuk sinkronisasi berkas anda" #: templates/personal.php:25 msgid "Show First Run Wizard again" diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po index c105afaa81..ca5a266207 100644 --- a/l10n/id/user_ldap.po +++ b/l10n/id/user_ldap.po @@ -4,13 +4,14 @@ # # Translators: # , 2012. +# Widya Walesa , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-08 00:10+0100\n" -"PO-Revision-Date: 2013-02-07 23:11+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 03:00+0000\n" +"Last-Translator: w41l \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,23 +21,23 @@ msgstr "" #: ajax/deleteConfiguration.php:34 msgid "Failed to delete the server configuration" -msgstr "" +msgstr "Gagal menghapus konfigurasi server" -#: ajax/testConfiguration.php:35 +#: ajax/testConfiguration.php:36 msgid "The configuration is valid and the connection could be established!" -msgstr "" +msgstr "Konfigurasi valid dan koneksi dapat dilakukan!" -#: ajax/testConfiguration.php:37 +#: ajax/testConfiguration.php:39 msgid "" "The configuration is valid, but the Bind failed. Please check the server " "settings and credentials." -msgstr "" +msgstr "Konfigurasi valid, tetapi Bind gagal. Silakan cek pengaturan server dan keamanan." -#: ajax/testConfiguration.php:40 +#: ajax/testConfiguration.php:43 msgid "" "The configuration is invalid. Please look in the ownCloud log for further " "details." -msgstr "" +msgstr "Konfigurasi salah. Silakan lihat log ownCloud untuk lengkapnya." #: js/settings.js:66 msgid "Deletion failed" @@ -44,267 +45,267 @@ msgstr "penghapusan gagal" #: js/settings.js:82 msgid "Take over settings from recent server configuration?" -msgstr "" +msgstr "Ambil alih pengaturan dari konfigurasi server saat ini?" #: js/settings.js:83 msgid "Keep settings?" -msgstr "" +msgstr "Biarkan pengaturan?" #: js/settings.js:97 msgid "Cannot add server configuration" -msgstr "" +msgstr "Gagal menambah konfigurasi server" #: js/settings.js:121 msgid "Connection test succeeded" -msgstr "" +msgstr "Tes koneksi sukses" #: js/settings.js:126 msgid "Connection test failed" -msgstr "" +msgstr "Tes koneksi gagal" #: js/settings.js:136 msgid "Do you really want to delete the current Server Configuration?" -msgstr "" +msgstr "Anda ingin menghapus Konfigurasi Server saat ini?" #: js/settings.js:137 msgid "Confirm Deletion" -msgstr "" +msgstr "Konfirmasi Penghapusan" #: templates/settings.php:8 msgid "" "Warning: Apps user_ldap and user_webdavauth are incompatible. You may" " experience unexpected behaviour. Please ask your system administrator to " "disable one of them." -msgstr "" +msgstr "Peringatan:/b> Aplikasi user_ldap dan user_webdavauth tidak kompatibel. Anda mungkin akan mengalami kejadian yang tidak diharapkan. Silakan minta administrator sistem untuk menonaktifkan salah satunya." #: templates/settings.php:11 msgid "" "Warning: The PHP LDAP module is not installed, the backend will not " "work. Please ask your system administrator to install it." -msgstr "" +msgstr "Peringatan: Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya." #: templates/settings.php:15 msgid "Server configuration" -msgstr "" +msgstr "Konfigurasi server" -#: templates/settings.php:17 +#: templates/settings.php:18 msgid "Add Server Configuration" -msgstr "" +msgstr "Tambah Konfigurasi Server" -#: templates/settings.php:21 +#: templates/settings.php:23 msgid "Host" msgstr "host" -#: templates/settings.php:21 +#: templates/settings.php:25 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" -msgstr "" +msgstr "Protokol dapat tidak ditulis, kecuali anda menggunakan SSL. Lalu jalankan dengan ldaps://" -#: templates/settings.php:22 +#: templates/settings.php:26 msgid "Base DN" -msgstr "" +msgstr "Base DN" -#: templates/settings.php:22 +#: templates/settings.php:27 msgid "One Base DN per line" -msgstr "" +msgstr "Satu Base DN per baris" -#: templates/settings.php:22 +#: templates/settings.php:28 msgid "You can specify Base DN for users and groups in the Advanced tab" -msgstr "" +msgstr "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan" -#: templates/settings.php:23 +#: templates/settings.php:30 msgid "User DN" -msgstr "" +msgstr "User DN" -#: templates/settings.php:23 +#: templates/settings.php:32 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." -msgstr "" +msgstr "DN dari klien pengguna yang dengannya tautan akan diterapkan, mis. uid=agen,dc=contoh,dc=com. Untuk akses anonim, biarkan DN dan kata sandi kosong." -#: templates/settings.php:24 +#: templates/settings.php:33 msgid "Password" msgstr "kata kunci" -#: templates/settings.php:24 +#: templates/settings.php:36 msgid "For anonymous access, leave DN and Password empty." -msgstr "" +msgstr "Untuk akses anonim, biarkan DN dan Kata sandi kosong." -#: templates/settings.php:25 +#: templates/settings.php:37 msgid "User Login Filter" msgstr "gunakan saringan login" -#: templates/settings.php:25 +#: templates/settings.php:40 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." -msgstr "" +msgstr "Definisikan filter untuk diterapkan, saat login dilakukan. %%uid menggantikan username saat login." -#: templates/settings.php:25 +#: templates/settings.php:41 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" -msgstr "" +msgstr "gunakan pengganti %%uid, mis. \"uid=%%uid\"" -#: templates/settings.php:26 +#: templates/settings.php:42 msgid "User List Filter" -msgstr "" +msgstr "Daftar Filter Pengguna" -#: templates/settings.php:26 +#: templates/settings.php:45 msgid "Defines the filter to apply, when retrieving users." -msgstr "" +msgstr "Definisikan filter untuk diterapkan saat menerima pengguna." -#: templates/settings.php:26 +#: templates/settings.php:46 msgid "without any placeholder, e.g. \"objectClass=person\"." -msgstr "" +msgstr "tanpa pengganti apapun, mis. \"objectClass=seseorang\"." -#: templates/settings.php:27 +#: templates/settings.php:47 msgid "Group Filter" msgstr "saringan grup" -#: templates/settings.php:27 +#: templates/settings.php:50 msgid "Defines the filter to apply, when retrieving groups." -msgstr "" +msgstr "Definisikan filter untuk diterapkan saat menerima grup." -#: templates/settings.php:27 +#: templates/settings.php:51 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." -msgstr "" +msgstr "tanpa pengganti apapaun, mis. \"objectClass=posixGroup\"." -#: templates/settings.php:31 +#: templates/settings.php:55 msgid "Connection Settings" -msgstr "" +msgstr "Pengaturan Koneksi" -#: templates/settings.php:33 +#: templates/settings.php:57 msgid "Configuration Active" -msgstr "" +msgstr "Konfigurasi Aktif" -#: templates/settings.php:33 +#: templates/settings.php:57 msgid "When unchecked, this configuration will be skipped." -msgstr "" +msgstr "Jika tidak dicentang, konfigurasi ini dilewati." -#: templates/settings.php:34 +#: templates/settings.php:58 msgid "Port" msgstr "port" -#: templates/settings.php:35 +#: templates/settings.php:59 msgid "Backup (Replica) Host" -msgstr "" +msgstr "Host Cadangan (Replika)" -#: templates/settings.php:35 +#: templates/settings.php:59 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." -msgstr "" +msgstr "Berikan pilihan host cadangan. Harus merupakan replika dari server LDAP/AD utama." -#: templates/settings.php:36 +#: templates/settings.php:60 msgid "Backup (Replica) Port" -msgstr "" +msgstr "Port Cadangan (Replika)" -#: templates/settings.php:37 +#: templates/settings.php:61 msgid "Disable Main Server" -msgstr "" +msgstr "Nonaktifkan Server Utama" -#: templates/settings.php:37 +#: templates/settings.php:61 msgid "When switched on, ownCloud will only connect to the replica server." -msgstr "" +msgstr "Saat diaktifkan, ownCloud hanya akan terhubung ke server replika." -#: templates/settings.php:38 +#: templates/settings.php:62 msgid "Use TLS" msgstr "gunakan TLS" -#: templates/settings.php:38 +#: templates/settings.php:62 msgid "Do not use it additionally for LDAPS connections, it will fail." -msgstr "" +msgstr "Jangan gunakan utamanya untuk koneksi LDAPS, koneksi akan gagal." -#: templates/settings.php:39 +#: templates/settings.php:63 msgid "Case insensitve LDAP server (Windows)" -msgstr "" +msgstr "Server LDAP dengan kapitalisasi tidak sensitif (Windows)" -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "Turn off SSL certificate validation." msgstr "matikan validasi sertivikat SSL" -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." -msgstr "" +msgstr "Jika koneksi hanya bekerja dengan opsi ini, impor sertifikat SSL server LDAP dari server ownCloud anda." -#: templates/settings.php:40 +#: templates/settings.php:64 msgid "Not recommended, use for testing only." msgstr "tidak disarankan, gunakan hanya untuk pengujian." -#: templates/settings.php:41 +#: templates/settings.php:65 msgid "in seconds. A change empties the cache." msgstr "dalam detik. perubahan mengosongkan cache" -#: templates/settings.php:43 +#: templates/settings.php:67 msgid "Directory Settings" -msgstr "" +msgstr "Pengaturan Direktori" -#: templates/settings.php:45 +#: templates/settings.php:69 msgid "User Display Name Field" -msgstr "" +msgstr "Bidang Tampilan Nama Pengguna" -#: templates/settings.php:45 +#: templates/settings.php:69 msgid "The LDAP attribute to use to generate the user`s ownCloud name." -msgstr "" +msgstr "Atribut LDAP yang digunakan untuk menghasilkan nama pengguna ownCloud." -#: templates/settings.php:46 +#: templates/settings.php:70 msgid "Base User Tree" -msgstr "" +msgstr "Pohon Pengguna Dasar" -#: templates/settings.php:46 +#: templates/settings.php:70 msgid "One User Base DN per line" -msgstr "" +msgstr "Satu Pengguna Base DN per baris" -#: templates/settings.php:47 +#: templates/settings.php:71 msgid "User Search Attributes" -msgstr "" +msgstr "Atribut Pencarian Pengguna" -#: templates/settings.php:47 templates/settings.php:50 +#: templates/settings.php:71 templates/settings.php:74 msgid "Optional; one attribute per line" -msgstr "" +msgstr "Pilihan; satu atribut per baris" -#: templates/settings.php:48 +#: templates/settings.php:72 msgid "Group Display Name Field" -msgstr "" +msgstr "Bidang Tampilan Nama Grup" -#: templates/settings.php:48 +#: templates/settings.php:72 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." -msgstr "" +msgstr "Atribut LDAP yang digunakan untuk menghasilkan nama grup ownCloud." -#: templates/settings.php:49 +#: templates/settings.php:73 msgid "Base Group Tree" -msgstr "" +msgstr "Pohon Grup Dasar" -#: templates/settings.php:49 +#: templates/settings.php:73 msgid "One Group Base DN per line" -msgstr "" +msgstr "Satu Grup Base DN per baris" -#: templates/settings.php:50 +#: templates/settings.php:74 msgid "Group Search Attributes" -msgstr "" +msgstr "Atribut Pencarian Grup" -#: templates/settings.php:51 +#: templates/settings.php:75 msgid "Group-Member association" -msgstr "" +msgstr "asosiasi Anggota-Grup" -#: templates/settings.php:53 +#: templates/settings.php:77 msgid "Special Attributes" -msgstr "" +msgstr "Atribut Khusus" -#: templates/settings.php:56 +#: templates/settings.php:80 msgid "in bytes" msgstr "dalam bytes" -#: templates/settings.php:58 +#: templates/settings.php:82 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." -msgstr "" +msgstr "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD." -#: templates/settings.php:62 +#: templates/settings.php:86 msgid "Help" msgstr "bantuan" diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po index 858d3ee076..8af5dc9fdd 100644 --- a/l10n/is/files_trashbin.po +++ b/l10n/is/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: is\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nafn" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 mappa" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} möppur" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 skrá" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} skrár" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po index f696193957..92dd72ca00 100644 --- a/l10n/it/files_trashbin.po +++ b/l10n/it/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 09:50+0000\n" -"Last-Translator: Vincenzo Reale \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \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" @@ -18,7 +18,7 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Impossibile eliminare %s definitivamente" @@ -28,35 +28,39 @@ msgstr "Impossibile eliminare %s definitivamente" msgid "Couldn't restore %s" msgstr "Impossibile ripristinare %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "esegui operazione di ripristino" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "elimina il file definitivamente" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nome" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Eliminati" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 cartella" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} cartelle" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 file" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} file" @@ -67,3 +71,7 @@ msgstr "Qui non c'è niente. Il tuo cestino è vuoto." #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Ripristina" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ja_JP/files_trashbin.po b/l10n/ja_JP/files_trashbin.po index a81dae25c6..b81d864712 100644 --- a/l10n/ja_JP/files_trashbin.po +++ b/l10n/ja_JP/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 09:50+0000\n" -"Last-Translator: Daisuke Deguchi \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: ja_JP\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "%s を完全に削除出来ませんでした" @@ -28,35 +28,39 @@ msgstr "%s を完全に削除出来ませんでした" msgid "Couldn't restore %s" msgstr "%s を復元出来ませんでした" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "復元操作を実行する" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "ファイルを完全に削除する" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "名前" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "削除済み" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 フォルダ" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} フォルダ" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 ファイル" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} ファイル" @@ -67,3 +71,7 @@ msgstr "ここには何もありません。ゴミ箱は空です！" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "復元" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po index 89f7efa5b6..499f14ca8c 100644 --- a/l10n/ka_GE/files_trashbin.po +++ b/l10n/ka_GE/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: ka_GE\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "სახელი" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 საქაღალდე" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} საქაღალდე" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 ფაილი" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} ფაილი" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po index d03c3476b2..5271e9cf04 100644 --- a/l10n/ko/files_trashbin.po +++ b/l10n/ko/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "이름" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "폴더 1개" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "폴더 {count}개" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "파일 1개" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "파일 {count}개" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "복원" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ku_IQ/files_trashbin.po b/l10n/ku_IQ/files_trashbin.po index 03fa59c580..a4a5d2ace6 100644 --- a/l10n/ku_IQ/files_trashbin.po +++ b/l10n/ku_IQ/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: ku_IQ\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "ناو" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/lb/files_trashbin.po b/l10n/lb/files_trashbin.po index 5b1856decd..b4f7cfe3a3 100644 --- a/l10n/lb/files_trashbin.po +++ b/l10n/lb/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: lb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Numm" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po index 928d63096c..1414400ddc 100644 --- a/l10n/lt_LT/files_trashbin.po +++ b/l10n/lt_LT/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: lt_LT\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Pavadinimas" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 aplankalas" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} aplankalai" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 failas" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} failai" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po index 71b39e763b..7710bac8da 100644 --- a/l10n/lv/files_trashbin.po +++ b/l10n/lv/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: Rūdolfs Mazurs \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: lv\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Nevarēja pilnībā izdzēst %s" @@ -28,35 +28,39 @@ msgstr "Nevarēja pilnībā izdzēst %s" msgid "Couldn't restore %s" msgstr "Nevarēja atjaunot %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "veikt atjaunošanu" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "dzēst datni pavisam" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nosaukums" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Dzēsts" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 mape" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} mapes" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 datne" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} datnes" @@ -67,3 +71,7 @@ msgstr "Šeit nekā nav. Jūsu miskaste ir tukša!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Atjaunot" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po index 173bc01b4e..609e2410e6 100644 --- a/l10n/mk/files_trashbin.po +++ b/l10n/mk/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: mk\n" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Име" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 папка" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} папки" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 датотека" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} датотеки" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po index 7924d440e3..513d1b9832 100644 --- a/l10n/ms_MY/files_trashbin.po +++ b/l10n/ms_MY/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: ms_MY\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nama" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po new file mode 100644 index 0000000000..66f60cd781 --- /dev/null +++ b/l10n/my_MM/core.po @@ -0,0 +1,594 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Pyae Sone , 2013. +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 10:30+0000\n" +"Last-Translator: Pyae Sone \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/share.php:85 +#, php-format +msgid "User %s shared a file with you" +msgstr "" + +#: ajax/share.php:87 +#, php-format +msgid "User %s shared a folder with you" +msgstr "" + +#: ajax/share.php:89 +#, php-format +msgid "" +"User %s shared the file \"%s\" with you. It is available for download here: " +"%s" +msgstr "" + +#: ajax/share.php:91 +#, php-format +msgid "" +"User %s shared the folder \"%s\" with you. It is available for download " +"here: %s" +msgstr "" + +#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 +msgid "Category type not provided." +msgstr "" + +#: ajax/vcategories/add.php:30 +msgid "No category to add?" +msgstr "" + +#: ajax/vcategories/add.php:37 +#, php-format +msgid "This category already exists: %s" +msgstr "" + +#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27 +#: ajax/vcategories/favorites.php:24 +#: ajax/vcategories/removeFromFavorites.php:26 +msgid "Object type not provided." +msgstr "" + +#: ajax/vcategories/addToFavorites.php:30 +#: ajax/vcategories/removeFromFavorites.php:30 +#, php-format +msgid "%s ID not provided." +msgstr "" + +#: ajax/vcategories/addToFavorites.php:35 +#, php-format +msgid "Error adding %s to favorites." +msgstr "" + +#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 +msgid "No categories selected for deletion." +msgstr "" + +#: ajax/vcategories/removeFromFavorites.php:35 +#, php-format +msgid "Error removing %s from favorites." +msgstr "" + +#: js/config.php:32 +msgid "Sunday" +msgstr "" + +#: js/config.php:32 +msgid "Monday" +msgstr "" + +#: js/config.php:32 +msgid "Tuesday" +msgstr "" + +#: js/config.php:32 +msgid "Wednesday" +msgstr "" + +#: js/config.php:32 +msgid "Thursday" +msgstr "" + +#: js/config.php:32 +msgid "Friday" +msgstr "" + +#: js/config.php:32 +msgid "Saturday" +msgstr "" + +#: js/config.php:33 +msgid "January" +msgstr "" + +#: js/config.php:33 +msgid "February" +msgstr "" + +#: js/config.php:33 +msgid "March" +msgstr "" + +#: js/config.php:33 +msgid "April" +msgstr "" + +#: js/config.php:33 +msgid "May" +msgstr "" + +#: js/config.php:33 +msgid "June" +msgstr "" + +#: js/config.php:33 +msgid "July" +msgstr "" + +#: js/config.php:33 +msgid "August" +msgstr "" + +#: js/config.php:33 +msgid "September" +msgstr "" + +#: js/config.php:33 +msgid "October" +msgstr "" + +#: js/config.php:33 +msgid "November" +msgstr "" + +#: js/config.php:33 +msgid "December" +msgstr "" + +#: js/js.js:286 +msgid "Settings" +msgstr "" + +#: js/js.js:767 +msgid "seconds ago" +msgstr "" + +#: js/js.js:768 +msgid "1 minute ago" +msgstr "" + +#: js/js.js:769 +msgid "{minutes} minutes ago" +msgstr "" + +#: js/js.js:770 +msgid "1 hour ago" +msgstr "" + +#: js/js.js:771 +msgid "{hours} hours ago" +msgstr "" + +#: js/js.js:772 +msgid "today" +msgstr "" + +#: js/js.js:773 +msgid "yesterday" +msgstr "" + +#: js/js.js:774 +msgid "{days} days ago" +msgstr "" + +#: js/js.js:775 +msgid "last month" +msgstr "" + +#: js/js.js:776 +msgid "{months} months ago" +msgstr "" + +#: js/js.js:777 +msgid "months ago" +msgstr "" + +#: js/js.js:778 +msgid "last year" +msgstr "" + +#: js/js.js:779 +msgid "years ago" +msgstr "" + +#: js/oc-dialogs.js:126 +msgid "Choose" +msgstr "" + +#: js/oc-dialogs.js:146 js/oc-dialogs.js:166 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:162 +msgid "No" +msgstr "" + +#: js/oc-dialogs.js:163 +msgid "Yes" +msgstr "" + +#: js/oc-dialogs.js:180 +msgid "Ok" +msgstr "" + +#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 +#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 +msgid "The object type is not specified." +msgstr "" + +#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 +#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582 +#: js/share.js:594 +msgid "Error" +msgstr "" + +#: js/oc-vcategories.js:179 +msgid "The app name is not specified." +msgstr "" + +#: js/oc-vcategories.js:194 +msgid "The required file {file} is not installed!" +msgstr "" + +#: js/share.js:29 js/share.js:43 js/share.js:90 +msgid "Shared" +msgstr "" + +#: js/share.js:93 +msgid "Share" +msgstr "" + +#: js/share.js:141 js/share.js:622 +msgid "Error while sharing" +msgstr "" + +#: js/share.js:152 +msgid "Error while unsharing" +msgstr "" + +#: js/share.js:159 +msgid "Error while changing permissions" +msgstr "" + +#: js/share.js:168 +msgid "Shared with you and the group {group} by {owner}" +msgstr "" + +#: js/share.js:170 +msgid "Shared with you by {owner}" +msgstr "" + +#: js/share.js:175 +msgid "Share with" +msgstr "" + +#: js/share.js:180 +msgid "Share with link" +msgstr "" + +#: js/share.js:183 +msgid "Password protect" +msgstr "" + +#: js/share.js:185 templates/installation.php:44 templates/login.php:35 +msgid "Password" +msgstr "" + +#: js/share.js:189 +msgid "Email link to person" +msgstr "" + +#: js/share.js:190 +msgid "Send" +msgstr "" + +#: js/share.js:194 +msgid "Set expiration date" +msgstr "" + +#: js/share.js:195 +msgid "Expiration date" +msgstr "" + +#: js/share.js:227 +msgid "Share via email:" +msgstr "" + +#: js/share.js:229 +msgid "No people found" +msgstr "" + +#: js/share.js:256 +msgid "Resharing is not allowed" +msgstr "" + +#: js/share.js:292 +msgid "Shared in {item} with {user}" +msgstr "" + +#: js/share.js:313 +msgid "Unshare" +msgstr "" + +#: js/share.js:325 +msgid "can edit" +msgstr "" + +#: js/share.js:327 +msgid "access control" +msgstr "" + +#: js/share.js:330 +msgid "create" +msgstr "" + +#: js/share.js:333 +msgid "update" +msgstr "" + +#: js/share.js:336 +msgid "delete" +msgstr "" + +#: js/share.js:339 +msgid "share" +msgstr "" + +#: js/share.js:373 js/share.js:569 +msgid "Password protected" +msgstr "" + +#: js/share.js:582 +msgid "Error unsetting expiration date" +msgstr "" + +#: js/share.js:594 +msgid "Error setting expiration date" +msgstr "" + +#: js/share.js:609 +msgid "Sending ..." +msgstr "" + +#: js/share.js:620 +msgid "Email sent" +msgstr "" + +#: js/update.js:14 +msgid "" +"The update was unsuccessful. Please report this issue to the ownCloud " +"community." +msgstr "" + +#: js/update.js:18 +msgid "The update was successful. Redirecting you to ownCloud now." +msgstr "" + +#: lostpassword/controller.php:48 +msgid "ownCloud password reset" +msgstr "" + +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "" + +#: lostpassword/templates/lostpassword.php:3 +msgid "You will receive a link to reset your password via Email." +msgstr "" + +#: lostpassword/templates/lostpassword.php:5 +msgid "Reset email send." +msgstr "" + +#: lostpassword/templates/lostpassword.php:8 +msgid "Request failed!" +msgstr "" + +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:28 +msgid "Username" +msgstr "" + +#: lostpassword/templates/lostpassword.php:14 +msgid "Request reset" +msgstr "" + +#: lostpassword/templates/resetpassword.php:4 +msgid "Your password was reset" +msgstr "" + +#: lostpassword/templates/resetpassword.php:5 +msgid "To login page" +msgstr "" + +#: lostpassword/templates/resetpassword.php:8 +msgid "New password" +msgstr "" + +#: lostpassword/templates/resetpassword.php:11 +msgid "Reset password" +msgstr "" + +#: strings.php:5 +msgid "Personal" +msgstr "" + +#: strings.php:6 +msgid "Users" +msgstr "" + +#: strings.php:7 +msgid "Apps" +msgstr "Apps" + +#: strings.php:8 +msgid "Admin" +msgstr "" + +#: strings.php:9 +msgid "Help" +msgstr "" + +#: templates/403.php:12 +msgid "Access forbidden" +msgstr "" + +#: templates/404.php:12 +msgid "Cloud not found" +msgstr "" + +#: templates/edit_categories_dialog.php:4 +msgid "Edit categories" +msgstr "" + +#: templates/edit_categories_dialog.php:16 +msgid "Add" +msgstr "" + +#: templates/installation.php:23 templates/installation.php:30 +msgid "Security Warning" +msgstr "" + +#: templates/installation.php:24 +msgid "" +"No secure random number generator is available, please enable the PHP " +"OpenSSL extension." +msgstr "" + +#: templates/installation.php:25 +msgid "" +"Without a secure random number generator an attacker may be able to predict " +"password reset tokens and take over your account." +msgstr "" + +#: templates/installation.php:31 +msgid "" +"Your data directory and files are probably accessible from the internet " +"because the .htaccess file does not work." +msgstr "" + +#: templates/installation.php:32 +msgid "" +"For information how to properly configure your server, please see the documentation." +msgstr "" + +#: templates/installation.php:36 +msgid "Create an admin account" +msgstr "" + +#: templates/installation.php:52 +msgid "Advanced" +msgstr "" + +#: templates/installation.php:54 +msgid "Data folder" +msgstr "" + +#: templates/installation.php:61 +msgid "Configure the database" +msgstr "" + +#: templates/installation.php:66 templates/installation.php:77 +#: templates/installation.php:87 templates/installation.php:97 +msgid "will be used" +msgstr "" + +#: templates/installation.php:109 +msgid "Database user" +msgstr "" + +#: templates/installation.php:113 +msgid "Database password" +msgstr "" + +#: templates/installation.php:117 +msgid "Database name" +msgstr "" + +#: templates/installation.php:125 +msgid "Database tablespace" +msgstr "" + +#: templates/installation.php:131 +msgid "Database host" +msgstr "" + +#: templates/installation.php:136 +msgid "Finish setup" +msgstr "" + +#: templates/layout.guest.php:33 +msgid "web services under your control" +msgstr "" + +#: templates/layout.user.php:48 +msgid "Log out" +msgstr "" + +#: templates/login.php:10 +msgid "Automatic logon rejected!" +msgstr "" + +#: templates/login.php:11 +msgid "" +"If you did not change your password recently, your account may be " +"compromised!" +msgstr "" + +#: templates/login.php:13 +msgid "Please change your password to secure your account again." +msgstr "" + +#: templates/login.php:19 +msgid "Lost your password?" +msgstr "" + +#: templates/login.php:41 +msgid "remember" +msgstr "" + +#: templates/login.php:43 +msgid "Log in" +msgstr "" + +#: templates/login.php:49 +msgid "Alternative Logins" +msgstr "" + +#: templates/part.pagenavi.php:3 +msgid "prev" +msgstr "" + +#: templates/part.pagenavi.php:20 +msgid "next" +msgstr "" + +#: templates/update.php:3 +#, php-format +msgid "Updating ownCloud to version %s, this may take a while." +msgstr "" diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po new file mode 100644 index 0000000000..528f0857ec --- /dev/null +++ b/l10n/my_MM/files.po @@ -0,0 +1,315 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2011-08-13 02:19+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/move.php:17 +#, php-format +msgid "Could not move %s - File with this name already exists" +msgstr "" + +#: ajax/move.php:27 ajax/move.php:30 +#, php-format +msgid "Could not move %s" +msgstr "" + +#: ajax/rename.php:22 ajax/rename.php:25 +msgid "Unable to rename file" +msgstr "" + +#: ajax/upload.php:19 +msgid "No file was uploaded. Unknown error" +msgstr "" + +#: ajax/upload.php:26 +msgid "There is no error, the file uploaded with success" +msgstr "" + +#: ajax/upload.php:27 +msgid "" +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " +msgstr "" + +#: ajax/upload.php:29 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form" +msgstr "" + +#: ajax/upload.php:31 +msgid "The uploaded file was only partially uploaded" +msgstr "" + +#: ajax/upload.php:32 +msgid "No file was uploaded" +msgstr "" + +#: ajax/upload.php:33 +msgid "Missing a temporary folder" +msgstr "" + +#: ajax/upload.php:34 +msgid "Failed to write to disk" +msgstr "" + +#: ajax/upload.php:52 +msgid "Not enough storage available" +msgstr "" + +#: ajax/upload.php:83 +msgid "Invalid directory." +msgstr "" + +#: appinfo/app.php:10 +msgid "Files" +msgstr "" + +#: js/fileactions.js:125 +msgid "Delete permanently" +msgstr "" + +#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92 +msgid "Delete" +msgstr "" + +#: js/fileactions.js:193 +msgid "Rename" +msgstr "" + +#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 +#: js/files.js:439 +msgid "Pending" +msgstr "" + +#: js/filelist.js:253 js/filelist.js:255 +msgid "{new_name} already exists" +msgstr "" + +#: js/filelist.js:253 js/filelist.js:255 +msgid "replace" +msgstr "" + +#: js/filelist.js:253 +msgid "suggest name" +msgstr "" + +#: js/filelist.js:253 js/filelist.js:255 +msgid "cancel" +msgstr "" + +#: js/filelist.js:295 +msgid "replaced {new_name}" +msgstr "" + +#: js/filelist.js:295 js/filelist.js:297 +msgid "undo" +msgstr "" + +#: js/filelist.js:297 +msgid "replaced {new_name} with {old_name}" +msgstr "" + +#: js/filelist.js:322 +msgid "perform delete operation" +msgstr "" + +#: js/files.js:52 +msgid "'.' is an invalid file name." +msgstr "" + +#: js/files.js:56 +msgid "File name cannot be empty." +msgstr "" + +#: js/files.js:64 +msgid "" +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " +"allowed." +msgstr "" + +#: js/files.js:78 +msgid "Your storage is full, files can not be updated or synced anymore!" +msgstr "" + +#: js/files.js:82 +msgid "Your storage is almost full ({usedSpacePercent}%)" +msgstr "" + +#: js/files.js:225 +msgid "" +"Your download is being prepared. This might take some time if the files are " +"big." +msgstr "" + +#: js/files.js:262 +msgid "Unable to upload your file as it is a directory or has 0 bytes" +msgstr "" + +#: js/files.js:262 +msgid "Upload Error" +msgstr "" + +#: js/files.js:273 +msgid "Close" +msgstr "" + +#: js/files.js:312 +msgid "1 file uploading" +msgstr "" + +#: js/files.js:315 js/files.js:370 js/files.js:385 +msgid "{count} files uploading" +msgstr "" + +#: js/files.js:388 js/files.js:423 +msgid "Upload cancelled." +msgstr "" + +#: js/files.js:497 +msgid "" +"File upload is in progress. Leaving the page now will cancel the upload." +msgstr "" + +#: js/files.js:570 +msgid "URL cannot be empty." +msgstr "" + +#: js/files.js:575 +msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" +msgstr "" + +#: js/files.js:949 templates/index.php:67 +msgid "Name" +msgstr "" + +#: js/files.js:950 templates/index.php:78 +msgid "Size" +msgstr "" + +#: js/files.js:951 templates/index.php:80 +msgid "Modified" +msgstr "" + +#: js/files.js:970 +msgid "1 folder" +msgstr "" + +#: js/files.js:972 +msgid "{count} folders" +msgstr "" + +#: js/files.js:980 +msgid "1 file" +msgstr "" + +#: js/files.js:982 +msgid "{count} files" +msgstr "" + +#: lib/helper.php:11 templates/index.php:18 +msgid "Upload" +msgstr "" + +#: templates/admin.php:5 +msgid "File handling" +msgstr "" + +#: templates/admin.php:7 +msgid "Maximum upload size" +msgstr "" + +#: templates/admin.php:10 +msgid "max. possible: " +msgstr "" + +#: templates/admin.php:15 +msgid "Needed for multi-file and folder downloads." +msgstr "" + +#: templates/admin.php:17 +msgid "Enable ZIP-download" +msgstr "" + +#: templates/admin.php:20 +msgid "0 is unlimited" +msgstr "" + +#: templates/admin.php:22 +msgid "Maximum input size for ZIP files" +msgstr "" + +#: templates/admin.php:26 +msgid "Save" +msgstr "" + +#: templates/index.php:7 +msgid "New" +msgstr "" + +#: templates/index.php:10 +msgid "Text file" +msgstr "" + +#: templates/index.php:12 +msgid "Folder" +msgstr "" + +#: templates/index.php:14 +msgid "From link" +msgstr "" + +#: templates/index.php:40 +msgid "Deleted files" +msgstr "" + +#: templates/index.php:46 +msgid "Cancel upload" +msgstr "" + +#: templates/index.php:59 +msgid "Nothing in here. Upload something!" +msgstr "" + +#: templates/index.php:73 +msgid "Download" +msgstr "" + +#: templates/index.php:85 templates/index.php:86 +msgid "Unshare" +msgstr "" + +#: templates/index.php:105 +msgid "Upload too large" +msgstr "" + +#: templates/index.php:107 +msgid "" +"The files you are trying to upload exceed the maximum size for file uploads " +"on this server." +msgstr "" + +#: templates/index.php:112 +msgid "Files are being scanned, please wait." +msgstr "" + +#: templates/index.php:115 +msgid "Current scanning" +msgstr "" + +#: templates/upgrade.php:2 +msgid "Upgrading filesystem cache..." +msgstr "" diff --git a/l10n/my_MM/files_encryption.po b/l10n/my_MM/files_encryption.po new file mode 100644 index 0000000000..e6b714b2cb --- /dev/null +++ b/l10n/my_MM/files_encryption.po @@ -0,0 +1,38 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2012-08-12 22:33+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: templates/settings-personal.php:4 templates/settings.php:5 +msgid "Encryption" +msgstr "" + +#: templates/settings-personal.php:7 +msgid "File encryption is enabled." +msgstr "" + +#: templates/settings-personal.php:11 +msgid "The following file types will not be encrypted:" +msgstr "" + +#: templates/settings.php:7 +msgid "Exclude the following file types from encryption:" +msgstr "" + +#: templates/settings.php:12 +msgid "None" +msgstr "" diff --git a/l10n/my_MM/files_external.po b/l10n/my_MM/files_external.po new file mode 100644 index 0000000000..4e24ec0555 --- /dev/null +++ b/l10n/my_MM/files_external.po @@ -0,0 +1,120 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2012-08-12 22:34+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23 +msgid "Access granted" +msgstr "" + +#: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86 +msgid "Error configuring Dropbox storage" +msgstr "" + +#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40 +msgid "Grant access" +msgstr "" + +#: js/dropbox.js:73 js/google.js:72 +msgid "Fill out all required fields" +msgstr "" + +#: js/dropbox.js:85 +msgid "Please provide a valid Dropbox app key and secret." +msgstr "" + +#: js/google.js:26 js/google.js:73 js/google.js:78 +msgid "Error configuring Google Drive storage" +msgstr "" + +#: lib/config.php:398 +msgid "" +"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares " +"is not possible. Please ask your system administrator to install it." +msgstr "" + +#: lib/config.php:401 +msgid "" +"Warning: 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 "" + +#: templates/settings.php:3 +msgid "External Storage" +msgstr "" + +#: templates/settings.php:8 templates/settings.php:22 +msgid "Mount point" +msgstr "" + +#: templates/settings.php:9 +msgid "Backend" +msgstr "" + +#: templates/settings.php:10 +msgid "Configuration" +msgstr "" + +#: templates/settings.php:11 +msgid "Options" +msgstr "" + +#: templates/settings.php:12 +msgid "Applicable" +msgstr "" + +#: templates/settings.php:27 +msgid "Add mount point" +msgstr "" + +#: templates/settings.php:85 +msgid "None set" +msgstr "" + +#: templates/settings.php:86 +msgid "All Users" +msgstr "" + +#: templates/settings.php:87 +msgid "Groups" +msgstr "" + +#: templates/settings.php:95 +msgid "Users" +msgstr "" + +#: templates/settings.php:108 templates/settings.php:109 +#: templates/settings.php:144 templates/settings.php:145 +msgid "Delete" +msgstr "" + +#: templates/settings.php:124 +msgid "Enable User External Storage" +msgstr "" + +#: templates/settings.php:125 +msgid "Allow users to mount their own external storage" +msgstr "" + +#: templates/settings.php:136 +msgid "SSL root certificates" +msgstr "" + +#: templates/settings.php:154 +msgid "Import Root Certificate" +msgstr "" diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po new file mode 100644 index 0000000000..2886a4d02b --- /dev/null +++ b/l10n/my_MM/files_sharing.po @@ -0,0 +1,48 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2012-08-12 22:35+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: templates/authenticate.php:4 +msgid "Password" +msgstr "" + +#: templates/authenticate.php:6 +msgid "Submit" +msgstr "" + +#: templates/public.php:9 +#, php-format +msgid "%s shared the folder %s with you" +msgstr "" + +#: templates/public.php:11 +#, php-format +msgid "%s shared the file %s with you" +msgstr "" + +#: templates/public.php:14 templates/public.php:30 +msgid "Download" +msgstr "" + +#: templates/public.php:29 +msgid "No preview available for" +msgstr "" + +#: templates/public.php:35 +msgid "web services under your control" +msgstr "" diff --git a/l10n/my_MM/files_trashbin.po b/l10n/my_MM/files_trashbin.po new file mode 100644 index 0000000000..33f2492dba --- /dev/null +++ b/l10n/my_MM/files_trashbin.po @@ -0,0 +1,76 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/delete.php:40 +#, php-format +msgid "Couldn't delete %s permanently" +msgstr "" + +#: ajax/undelete.php:41 +#, php-format +msgid "Couldn't restore %s" +msgstr "" + +#: js/trash.js:7 js/trash.js:96 +msgid "perform restore operation" +msgstr "" + +#: js/trash.js:34 +msgid "delete file permanently" +msgstr "" + +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 +msgid "Name" +msgstr "" + +#: js/trash.js:152 templates/index.php:27 +msgid "Deleted" +msgstr "" + +#: js/trash.js:161 +msgid "1 folder" +msgstr "" + +#: js/trash.js:163 +msgid "{count} folders" +msgstr "" + +#: js/trash.js:171 +msgid "1 file" +msgstr "" + +#: js/trash.js:173 +msgid "{count} files" +msgstr "" + +#: templates/index.php:9 +msgid "Nothing in here. Your trash bin is empty!" +msgstr "" + +#: templates/index.php:20 templates/index.php:22 +msgid "Restore" +msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/my_MM/files_versions.po b/l10n/my_MM/files_versions.po new file mode 100644 index 0000000000..4fac18084e --- /dev/null +++ b/l10n/my_MM/files_versions.po @@ -0,0 +1,65 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2012-08-12 22:37+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/rollbackVersion.php:15 +#, php-format +msgid "Could not revert: %s" +msgstr "" + +#: history.php:40 +msgid "success" +msgstr "" + +#: history.php:42 +#, php-format +msgid "File %s was reverted to version %s" +msgstr "" + +#: history.php:49 +msgid "failure" +msgstr "" + +#: history.php:51 +#, php-format +msgid "File %s could not be reverted to version %s" +msgstr "" + +#: history.php:68 +msgid "No old versions available" +msgstr "" + +#: history.php:73 +msgid "No path specified" +msgstr "" + +#: js/versions.js:16 +msgid "History" +msgstr "" + +#: templates/history.php:20 +msgid "Revert a file to a previous version by clicking on its revert button" +msgstr "" + +#: templates/settings.php:3 +msgid "Files Versioning" +msgstr "" + +#: templates/settings.php:4 +msgid "Enable" +msgstr "" diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po new file mode 100644 index 0000000000..456137d82d --- /dev/null +++ b/l10n/my_MM/lib.po @@ -0,0 +1,253 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2012-07-27 22:23+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: app.php:349 +msgid "Help" +msgstr "" + +#: app.php:362 +msgid "Personal" +msgstr "" + +#: app.php:373 +msgid "Settings" +msgstr "" + +#: app.php:385 +msgid "Users" +msgstr "" + +#: app.php:398 +msgid "Apps" +msgstr "Apps" + +#: app.php:406 +msgid "Admin" +msgstr "" + +#: files.php:202 +msgid "ZIP download is turned off." +msgstr "" + +#: files.php:203 +msgid "Files need to be downloaded one by one." +msgstr "" + +#: files.php:204 files.php:231 +msgid "Back to Files" +msgstr "" + +#: files.php:228 +msgid "Selected files too large to generate zip file." +msgstr "" + +#: helper.php:228 +msgid "couldn't be determined" +msgstr "" + +#: json.php:28 +msgid "Application is not enabled" +msgstr "" + +#: json.php:39 json.php:62 json.php:73 +msgid "Authentication error" +msgstr "" + +#: json.php:51 +msgid "Token expired. Please reload page." +msgstr "" + +#: search/provider/file.php:17 search/provider/file.php:35 +msgid "Files" +msgstr "" + +#: search/provider/file.php:26 search/provider/file.php:33 +msgid "Text" +msgstr "" + +#: search/provider/file.php:29 +msgid "Images" +msgstr "" + +#: setup.php:34 +msgid "Set an admin username." +msgstr "" + +#: setup.php:37 +msgid "Set an admin password." +msgstr "" + +#: setup.php:40 +msgid "Specify a data folder." +msgstr "" + +#: setup.php:53 +#, php-format +msgid "%s enter the database username." +msgstr "" + +#: setup.php:56 +#, php-format +msgid "%s enter the database name." +msgstr "" + +#: setup.php:59 +#, php-format +msgid "%s you may not use dots in the database name" +msgstr "" + +#: setup.php:62 +#, php-format +msgid "%s set the database host." +msgstr "" + +#: setup.php:126 setup.php:294 setup.php:339 +msgid "PostgreSQL username and/or password not valid" +msgstr "" + +#: setup.php:127 setup.php:150 setup.php:204 +msgid "You need to enter either an existing account or the administrator." +msgstr "" + +#: setup.php:149 setup.php:427 setup.php:494 +msgid "Oracle username and/or password not valid" +msgstr "" + +#: setup.php:203 +msgid "MySQL username and/or password not valid" +msgstr "" + +#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397 +#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534 +#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578 +#: setup.php:584 +#, php-format +msgid "DB Error: \"%s\"" +msgstr "" + +#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398 +#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535 +#: setup.php:546 setup.php:562 setup.php:570 setup.php:579 +#, php-format +msgid "Offending command was: \"%s\"" +msgstr "" + +#: setup.php:273 +#, php-format +msgid "MySQL user '%s'@'localhost' exists already." +msgstr "" + +#: setup.php:274 +msgid "Drop this user from MySQL" +msgstr "" + +#: setup.php:279 +#, php-format +msgid "MySQL user '%s'@'%%' already exists" +msgstr "" + +#: setup.php:280 +msgid "Drop this user from MySQL." +msgstr "" + +#: setup.php:553 setup.php:585 +#, php-format +msgid "Offending command was: \"%s\", name: %s, password: %s" +msgstr "" + +#: setup.php:649 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: setup.php:651 +#, php-format +msgid "Please double check the installation guides." +msgstr "" + +#: template.php:113 +msgid "seconds ago" +msgstr "" + +#: template.php:114 +msgid "1 minute ago" +msgstr "" + +#: template.php:115 +#, php-format +msgid "%d minutes ago" +msgstr "" + +#: template.php:116 +msgid "1 hour ago" +msgstr "" + +#: template.php:117 +#, php-format +msgid "%d hours ago" +msgstr "" + +#: template.php:118 +msgid "today" +msgstr "" + +#: template.php:119 +msgid "yesterday" +msgstr "" + +#: template.php:120 +#, php-format +msgid "%d days ago" +msgstr "" + +#: template.php:121 +msgid "last month" +msgstr "" + +#: template.php:122 +#, php-format +msgid "%d months ago" +msgstr "" + +#: template.php:123 +msgid "last year" +msgstr "" + +#: template.php:124 +msgid "years ago" +msgstr "" + +#: updater.php:78 +#, php-format +msgid "%s is available. Get more information" +msgstr "" + +#: updater.php:81 +msgid "up to date" +msgstr "" + +#: updater.php:84 +msgid "updates check is disabled" +msgstr "" + +#: vcategories.php:188 vcategories.php:249 +#, php-format +msgid "Could not find category \"%s\"" +msgstr "" diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po new file mode 100644 index 0000000000..ade1a7d73e --- /dev/null +++ b/l10n/my_MM/settings.po @@ -0,0 +1,496 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2011-07-25 16:05+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/apps/ocs.php:20 +msgid "Unable to load list from App Store" +msgstr "" + +#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15 +#: ajax/togglegroups.php:18 +msgid "Authentication error" +msgstr "" + +#: ajax/changedisplayname.php:32 +msgid "Unable to change display name" +msgstr "" + +#: ajax/creategroup.php:10 +msgid "Group already exists" +msgstr "" + +#: ajax/creategroup.php:19 +msgid "Unable to add group" +msgstr "" + +#: ajax/enableapp.php:11 +msgid "Could not enable app. " +msgstr "" + +#: ajax/lostpassword.php:12 +msgid "Email saved" +msgstr "" + +#: ajax/lostpassword.php:14 +msgid "Invalid email" +msgstr "" + +#: ajax/removegroup.php:13 +msgid "Unable to delete group" +msgstr "" + +#: ajax/removeuser.php:24 +msgid "Unable to delete user" +msgstr "" + +#: ajax/setlanguage.php:15 +msgid "Language changed" +msgstr "" + +#: ajax/setlanguage.php:17 ajax/setlanguage.php:20 +msgid "Invalid request" +msgstr "" + +#: ajax/togglegroups.php:12 +msgid "Admins can't remove themself from the admin group" +msgstr "" + +#: ajax/togglegroups.php:28 +#, php-format +msgid "Unable to add user to group %s" +msgstr "" + +#: ajax/togglegroups.php:34 +#, php-format +msgid "Unable to remove user from group %s" +msgstr "" + +#: ajax/updateapp.php:14 +msgid "Couldn't update app." +msgstr "" + +#: js/apps.js:30 +msgid "Update to {appversion}" +msgstr "" + +#: js/apps.js:36 js/apps.js:76 +msgid "Disable" +msgstr "" + +#: js/apps.js:36 js/apps.js:64 +msgid "Enable" +msgstr "" + +#: js/apps.js:55 +msgid "Please wait...." +msgstr "" + +#: js/apps.js:84 +msgid "Updating...." +msgstr "" + +#: js/apps.js:87 +msgid "Error while updating app" +msgstr "" + +#: js/apps.js:87 +msgid "Error" +msgstr "" + +#: js/apps.js:90 +msgid "Updated" +msgstr "" + +#: js/personal.js:96 +msgid "Saving..." +msgstr "" + +#: js/users.js:30 +msgid "deleted" +msgstr "" + +#: js/users.js:30 +msgid "undo" +msgstr "" + +#: js/users.js:62 +msgid "Unable to remove user" +msgstr "" + +#: js/users.js:75 templates/users.php:26 templates/users.php:80 +#: templates/users.php:105 +msgid "Groups" +msgstr "" + +#: js/users.js:78 templates/users.php:82 templates/users.php:119 +msgid "Group Admin" +msgstr "" + +#: js/users.js:99 templates/users.php:161 +msgid "Delete" +msgstr "" + +#: js/users.js:191 +msgid "add group" +msgstr "" + +#: js/users.js:352 +msgid "A valid username must be provided" +msgstr "" + +#: js/users.js:353 js/users.js:359 js/users.js:374 +msgid "Error creating user" +msgstr "" + +#: js/users.js:358 +msgid "A valid password must be provided" +msgstr "" + +#: personal.php:29 personal.php:30 +msgid "__language_name__" +msgstr "" + +#: templates/admin.php:15 +msgid "Security Warning" +msgstr "" + +#: templates/admin.php:18 +msgid "" +"Your data directory and your files are probably accessible from the " +"internet. The .htaccess file that ownCloud provides is not working. We " +"strongly suggest that you configure your webserver in a way that the data " +"directory is no longer accessible or you move the data directory outside the" +" webserver document root." +msgstr "" + +#: templates/admin.php:29 +msgid "Setup Warning" +msgstr "" + +#: templates/admin.php:32 +msgid "" +"Your web server is not yet properly setup to allow files synchronization " +"because the WebDAV interface seems to be broken." +msgstr "" + +#: templates/admin.php:33 +#, php-format +msgid "Please double check the installation guides." +msgstr "" + +#: templates/admin.php:44 +msgid "Module 'fileinfo' missing" +msgstr "" + +#: templates/admin.php:47 +msgid "" +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this " +"module to get best results with mime-type detection." +msgstr "" + +#: templates/admin.php:58 +msgid "Locale not working" +msgstr "" + +#: templates/admin.php:61 +msgid "" +"This ownCloud server can't set system locale to " +"\"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8." +msgstr "" + +#: templates/admin.php:72 +msgid "Internet connection not working" +msgstr "" + +#: templates/admin.php:75 +msgid "" +"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." +msgstr "" + +#: templates/admin.php:89 +msgid "Cron" +msgstr "" + +#: templates/admin.php:98 +msgid "Execute one task with each page loaded" +msgstr "" + +#: templates/admin.php:108 +msgid "" +"cron.php is registered at a webcron service. Call the cron.php page in the " +"owncloud root once a minute over http." +msgstr "" + +#: templates/admin.php:118 +msgid "" +"Use systems cron service. Call the cron.php file in the owncloud folder via " +"a system cronjob once a minute." +msgstr "" + +#: templates/admin.php:125 +msgid "Sharing" +msgstr "" + +#: templates/admin.php:131 +msgid "Enable Share API" +msgstr "" + +#: templates/admin.php:132 +msgid "Allow apps to use the Share API" +msgstr "" + +#: templates/admin.php:139 +msgid "Allow links" +msgstr "" + +#: templates/admin.php:140 +msgid "Allow users to share items to the public with links" +msgstr "" + +#: templates/admin.php:147 +msgid "Allow resharing" +msgstr "" + +#: templates/admin.php:148 +msgid "Allow users to share items shared with them again" +msgstr "" + +#: templates/admin.php:155 +msgid "Allow users to share with anyone" +msgstr "" + +#: templates/admin.php:158 +msgid "Allow users to only share with users in their groups" +msgstr "" + +#: templates/admin.php:165 +msgid "Security" +msgstr "" + +#: templates/admin.php:178 +msgid "Enforce HTTPS" +msgstr "" + +#: templates/admin.php:179 +msgid "" +"Enforces the clients to connect to ownCloud via an encrypted connection." +msgstr "" + +#: templates/admin.php:182 +msgid "" +"Please connect to this ownCloud instance via HTTPS to enable or disable the " +"SSL enforcement." +msgstr "" + +#: templates/admin.php:192 +msgid "Log" +msgstr "" + +#: templates/admin.php:193 +msgid "Log level" +msgstr "" + +#: templates/admin.php:220 +msgid "More" +msgstr "" + +#: templates/admin.php:227 templates/personal.php:98 +msgid "Version" +msgstr "" + +#: templates/admin.php:230 templates/personal.php:100 +msgid "" +"Developed by the ownCloud community, the source code is " +"licensed under the AGPL." +msgstr "" + +#: templates/apps.php:10 +msgid "Add your App" +msgstr "" + +#: templates/apps.php:11 +msgid "More Apps" +msgstr "" + +#: templates/apps.php:24 +msgid "Select an App" +msgstr "" + +#: templates/apps.php:28 +msgid "See application page at apps.owncloud.com" +msgstr "" + +#: templates/apps.php:29 +msgid "-licensed by " +msgstr "" + +#: templates/apps.php:31 +msgid "Update" +msgstr "" + +#: templates/help.php:3 +msgid "User Documentation" +msgstr "" + +#: templates/help.php:4 +msgid "Administrator Documentation" +msgstr "" + +#: templates/help.php:6 +msgid "Online Documentation" +msgstr "" + +#: templates/help.php:7 +msgid "Forum" +msgstr "" + +#: templates/help.php:9 +msgid "Bugtracker" +msgstr "" + +#: templates/help.php:11 +msgid "Commercial Support" +msgstr "" + +#: templates/personal.php:8 +#, php-format +msgid "You have used %s of the available %s" +msgstr "" + +#: templates/personal.php:14 +msgid "Get the apps to sync your files" +msgstr "" + +#: templates/personal.php:25 +msgid "Show First Run Wizard again" +msgstr "" + +#: templates/personal.php:36 templates/users.php:23 templates/users.php:79 +msgid "Password" +msgstr "" + +#: templates/personal.php:37 +msgid "Your password was changed" +msgstr "" + +#: templates/personal.php:38 +msgid "Unable to change your password" +msgstr "" + +#: templates/personal.php:39 +msgid "Current password" +msgstr "" + +#: templates/personal.php:40 +msgid "New password" +msgstr "" + +#: templates/personal.php:42 +msgid "Change password" +msgstr "" + +#: templates/personal.php:54 templates/users.php:78 +msgid "Display Name" +msgstr "" + +#: templates/personal.php:55 +msgid "Your display name was changed" +msgstr "" + +#: templates/personal.php:56 +msgid "Unable to change your display name" +msgstr "" + +#: templates/personal.php:59 +msgid "Change display name" +msgstr "" + +#: templates/personal.php:68 +msgid "Email" +msgstr "" + +#: templates/personal.php:69 +msgid "Your email address" +msgstr "" + +#: templates/personal.php:70 +msgid "Fill in an email address to enable password recovery" +msgstr "" + +#: templates/personal.php:76 templates/personal.php:77 +msgid "Language" +msgstr "" + +#: templates/personal.php:82 +msgid "Help translate" +msgstr "" + +#: templates/personal.php:87 +msgid "WebDAV" +msgstr "" + +#: templates/personal.php:89 +msgid "Use this address to connect to your ownCloud in your file manager" +msgstr "" + +#: templates/users.php:21 templates/users.php:77 +msgid "Login Name" +msgstr "" + +#: templates/users.php:32 +msgid "Create" +msgstr "" + +#: templates/users.php:35 +msgid "Default Storage" +msgstr "" + +#: templates/users.php:41 templates/users.php:139 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:59 templates/users.php:154 +msgid "Other" +msgstr "" + +#: templates/users.php:84 +msgid "Storage" +msgstr "" + +#: templates/users.php:95 +msgid "change display name" +msgstr "" + +#: templates/users.php:99 +msgid "set new password" +msgstr "" + +#: templates/users.php:134 +msgid "Default" +msgstr "" diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po new file mode 100644 index 0000000000..3c0718016b --- /dev/null +++ b/l10n/my_MM/user_ldap.po @@ -0,0 +1,309 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2012-08-12 22:45+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ajax/deleteConfiguration.php:34 +msgid "Failed to delete the server configuration" +msgstr "" + +#: ajax/testConfiguration.php:36 +msgid "The configuration is valid and the connection could be established!" +msgstr "" + +#: ajax/testConfiguration.php:39 +msgid "" +"The configuration is valid, but the Bind failed. Please check the server " +"settings and credentials." +msgstr "" + +#: ajax/testConfiguration.php:43 +msgid "" +"The configuration is invalid. Please look in the ownCloud log for further " +"details." +msgstr "" + +#: js/settings.js:66 +msgid "Deletion failed" +msgstr "" + +#: js/settings.js:82 +msgid "Take over settings from recent server configuration?" +msgstr "" + +#: js/settings.js:83 +msgid "Keep settings?" +msgstr "" + +#: js/settings.js:97 +msgid "Cannot add server configuration" +msgstr "" + +#: js/settings.js:121 +msgid "Connection test succeeded" +msgstr "" + +#: js/settings.js:126 +msgid "Connection test failed" +msgstr "" + +#: js/settings.js:136 +msgid "Do you really want to delete the current Server Configuration?" +msgstr "" + +#: js/settings.js:137 +msgid "Confirm Deletion" +msgstr "" + +#: templates/settings.php:8 +msgid "" +"Warning: Apps user_ldap and user_webdavauth are incompatible. You may" +" experience unexpected behaviour. Please ask your system administrator to " +"disable one of them." +msgstr "" + +#: templates/settings.php:11 +msgid "" +"Warning: The PHP LDAP module is not installed, the backend will not " +"work. Please ask your system administrator to install it." +msgstr "" + +#: templates/settings.php:15 +msgid "Server configuration" +msgstr "" + +#: templates/settings.php:18 +msgid "Add Server Configuration" +msgstr "" + +#: templates/settings.php:23 +msgid "Host" +msgstr "" + +#: templates/settings.php:25 +msgid "" +"You can omit the protocol, except you require SSL. Then start with ldaps://" +msgstr "" + +#: templates/settings.php:26 +msgid "Base DN" +msgstr "" + +#: templates/settings.php:27 +msgid "One Base DN per line" +msgstr "" + +#: templates/settings.php:28 +msgid "You can specify Base DN for users and groups in the Advanced tab" +msgstr "" + +#: templates/settings.php:30 +msgid "User DN" +msgstr "" + +#: templates/settings.php:32 +msgid "" +"The DN of the client user with which the bind shall be done, e.g. " +"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " +"empty." +msgstr "" + +#: templates/settings.php:33 +msgid "Password" +msgstr "" + +#: templates/settings.php:36 +msgid "For anonymous access, leave DN and Password empty." +msgstr "" + +#: templates/settings.php:37 +msgid "User Login Filter" +msgstr "" + +#: templates/settings.php:40 +#, php-format +msgid "" +"Defines the filter to apply, when login is attempted. %%uid replaces the " +"username in the login action." +msgstr "" + +#: templates/settings.php:41 +#, php-format +msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" +msgstr "" + +#: templates/settings.php:42 +msgid "User List Filter" +msgstr "" + +#: templates/settings.php:45 +msgid "Defines the filter to apply, when retrieving users." +msgstr "" + +#: templates/settings.php:46 +msgid "without any placeholder, e.g. \"objectClass=person\"." +msgstr "" + +#: templates/settings.php:47 +msgid "Group Filter" +msgstr "" + +#: templates/settings.php:50 +msgid "Defines the filter to apply, when retrieving groups." +msgstr "" + +#: templates/settings.php:51 +msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." +msgstr "" + +#: templates/settings.php:55 +msgid "Connection Settings" +msgstr "" + +#: templates/settings.php:57 +msgid "Configuration Active" +msgstr "" + +#: templates/settings.php:57 +msgid "When unchecked, this configuration will be skipped." +msgstr "" + +#: templates/settings.php:58 +msgid "Port" +msgstr "" + +#: templates/settings.php:59 +msgid "Backup (Replica) Host" +msgstr "" + +#: templates/settings.php:59 +msgid "" +"Give an optional backup host. It must be a replica of the main LDAP/AD " +"server." +msgstr "" + +#: templates/settings.php:60 +msgid "Backup (Replica) Port" +msgstr "" + +#: templates/settings.php:61 +msgid "Disable Main Server" +msgstr "" + +#: templates/settings.php:61 +msgid "When switched on, ownCloud will only connect to the replica server." +msgstr "" + +#: templates/settings.php:62 +msgid "Use TLS" +msgstr "" + +#: templates/settings.php:62 +msgid "Do not use it additionally for LDAPS connections, it will fail." +msgstr "" + +#: templates/settings.php:63 +msgid "Case insensitve LDAP server (Windows)" +msgstr "" + +#: templates/settings.php:64 +msgid "Turn off SSL certificate validation." +msgstr "" + +#: templates/settings.php:64 +msgid "" +"If connection only works with this option, import the LDAP server's SSL " +"certificate in your ownCloud server." +msgstr "" + +#: templates/settings.php:64 +msgid "Not recommended, use for testing only." +msgstr "" + +#: templates/settings.php:65 +msgid "in seconds. A change empties the cache." +msgstr "" + +#: templates/settings.php:67 +msgid "Directory Settings" +msgstr "" + +#: templates/settings.php:69 +msgid "User Display Name Field" +msgstr "" + +#: templates/settings.php:69 +msgid "The LDAP attribute to use to generate the user`s ownCloud name." +msgstr "" + +#: templates/settings.php:70 +msgid "Base User Tree" +msgstr "" + +#: templates/settings.php:70 +msgid "One User Base DN per line" +msgstr "" + +#: templates/settings.php:71 +msgid "User Search Attributes" +msgstr "" + +#: templates/settings.php:71 templates/settings.php:74 +msgid "Optional; one attribute per line" +msgstr "" + +#: templates/settings.php:72 +msgid "Group Display Name Field" +msgstr "" + +#: templates/settings.php:72 +msgid "The LDAP attribute to use to generate the groups`s ownCloud name." +msgstr "" + +#: templates/settings.php:73 +msgid "Base Group Tree" +msgstr "" + +#: templates/settings.php:73 +msgid "One Group Base DN per line" +msgstr "" + +#: templates/settings.php:74 +msgid "Group Search Attributes" +msgstr "" + +#: templates/settings.php:75 +msgid "Group-Member association" +msgstr "" + +#: templates/settings.php:77 +msgid "Special Attributes" +msgstr "" + +#: templates/settings.php:80 +msgid "in bytes" +msgstr "" + +#: templates/settings.php:82 +msgid "" +"Leave empty for user name (default). Otherwise, specify an LDAP/AD " +"attribute." +msgstr "" + +#: templates/settings.php:86 +msgid "Help" +msgstr "" diff --git a/l10n/my_MM/user_webdavauth.po b/l10n/my_MM/user_webdavauth.po new file mode 100644 index 0000000000..45d8ff660d --- /dev/null +++ b/l10n/my_MM/user_webdavauth.po @@ -0,0 +1,33 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2012-11-09 09:06+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my_MM\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: templates/settings.php:3 +msgid "WebDAV Authentication" +msgstr "" + +#: templates/settings.php:4 +msgid "URL: http://" +msgstr "" + +#: templates/settings.php:7 +msgid "" +"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." +msgstr "" diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po index d745e97940..81d8126f33 100644 --- a/l10n/nb_NO/files_trashbin.po +++ b/l10n/nb_NO/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: nb_NO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Navn" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 mappe" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} mapper" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 fil" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} filer" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po index 3798b0d116..e418e34f1d 100644 --- a/l10n/nl/files_trashbin.po +++ b/l10n/nl/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: André Koot \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Kon %s niet permanent verwijderen" @@ -28,35 +28,39 @@ msgstr "Kon %s niet permanent verwijderen" msgid "Couldn't restore %s" msgstr "Kon %s niet herstellen" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "uitvoeren restore operatie" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "verwijder bestanden definitief" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Naam" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Verwijderd" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 map" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} mappen" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 bestand" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} bestanden" @@ -67,3 +71,7 @@ msgstr "Niets te vinden. Uw prullenbak is leeg!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Herstellen" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po index 43941fff2c..ef3eb61285 100644 --- a/l10n/nn_NO/files_trashbin.po +++ b/l10n/nn_NO/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: nn_NO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Namn" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/oc/files_trashbin.po b/l10n/oc/files_trashbin.po index f3243c02aa..318cc3209b 100644 --- a/l10n/oc/files_trashbin.po +++ b/l10n/oc/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: oc\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nom" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po index eea8ff8f6d..a793874bb4 100644 --- a/l10n/pl/files_trashbin.po +++ b/l10n/pl/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 09:50+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nazwa" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 folder" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} foldery" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 plik" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} pliki" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Przywróć" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/pl_PL/files_trashbin.po b/l10n/pl_PL/files_trashbin.po index d35b236c8f..e158e5a65e 100644 --- a/l10n/pl_PL/files_trashbin.po +++ b/l10n/pl_PL/files_trashbin.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-02-08 00:10+0100\n" -"PO-Revision-Date: 2013-02-07 23:11+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: pl_PL\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po index 9e297e235b..dc448a8091 100644 --- a/l10n/pt_BR/files.po +++ b/l10n/pt_BR/files.po @@ -10,15 +10,16 @@ # Rodrigo Tavares , 2013. # , 2012. # Thiago Vicente , 2012. +# Tulio Simoes Martins Padilha , 2013. # Unforgiving Fallout <>, 2012. # Van Der Fran , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-15 00:04+0100\n" -"PO-Revision-Date: 2013-02-14 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 20:00+0000\n" +"Last-Translator: tuliouel \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" @@ -99,8 +100,8 @@ msgstr "Excluir" msgid "Rename" msgstr "Renomear" -#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407 -#: js/files.js:438 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 +#: js/files.js:439 msgid "Pending" msgstr "Pendente" @@ -158,74 +159,74 @@ msgstr "Seu armazenamento está cheio, arquivos não serão mais atualizados nem msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Seu armazenamento está quase cheio ({usedSpacePercent}%)" -#: js/files.js:224 +#: js/files.js:225 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes." -#: js/files.js:261 +#: js/files.js:262 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes." -#: js/files.js:261 +#: js/files.js:262 msgid "Upload Error" msgstr "Erro de envio" -#: js/files.js:272 +#: js/files.js:273 msgid "Close" msgstr "Fechar" -#: js/files.js:311 +#: js/files.js:312 msgid "1 file uploading" msgstr "enviando 1 arquivo" -#: js/files.js:314 js/files.js:369 js/files.js:384 +#: js/files.js:315 js/files.js:370 js/files.js:385 msgid "{count} files uploading" msgstr "Enviando {count} arquivos" -#: js/files.js:387 js/files.js:422 +#: js/files.js:388 js/files.js:423 msgid "Upload cancelled." msgstr "Envio cancelado." -#: js/files.js:496 +#: js/files.js:497 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Upload em andamento. Sair da página agora resultará no cancelamento do envio." -#: js/files.js:569 +#: js/files.js:570 msgid "URL cannot be empty." msgstr "URL não pode ficar em branco" -#: js/files.js:574 +#: js/files.js:575 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "Nome de pasta inválido. O uso de 'Shared' é reservado para o Owncloud" -#: js/files.js:948 templates/index.php:67 +#: js/files.js:949 templates/index.php:67 msgid "Name" msgstr "Nome" -#: js/files.js:949 templates/index.php:78 +#: js/files.js:950 templates/index.php:78 msgid "Size" msgstr "Tamanho" -#: js/files.js:950 templates/index.php:80 +#: js/files.js:951 templates/index.php:80 msgid "Modified" msgstr "Modificado" -#: js/files.js:969 +#: js/files.js:970 msgid "1 folder" msgstr "1 pasta" -#: js/files.js:971 +#: js/files.js:972 msgid "{count} folders" msgstr "{count} pastas" -#: js/files.js:979 +#: js/files.js:980 msgid "1 file" msgstr "1 arquivo" -#: js/files.js:981 +#: js/files.js:982 msgid "{count} files" msgstr "{count} arquivos" @@ -283,7 +284,7 @@ msgstr "Do link" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Arquivos apagados" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po index e5e109080a..f506517b43 100644 --- a/l10n/pt_BR/files_trashbin.po +++ b/l10n/pt_BR/files_trashbin.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-02-15 00:05+0100\n" -"PO-Revision-Date: 2013-02-14 00:00+0000\n" -"Last-Translator: rodrigost23 \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \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" @@ -18,7 +18,7 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Não foi possível excluir %s permanentemente" @@ -28,35 +28,39 @@ msgstr "Não foi possível excluir %s permanentemente" msgid "Couldn't restore %s" msgstr "Não foi possível restaurar %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "realizar operação de restauração" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "excluir arquivo permanentemente" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nome" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Excluído" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 pasta" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} pastas" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 arquivo" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} arquivos" @@ -67,3 +71,7 @@ msgstr "Nada aqui. Sua lixeira está vazia!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Restaurar" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po index f3ba82a97b..31113fe0d4 100644 --- a/l10n/pt_BR/user_ldap.po +++ b/l10n/pt_BR/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-19 00:05+0100\n" -"PO-Revision-Date: 2013-02-18 14:10+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 20:00+0000\n" "Last-Translator: tuliouel \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -46,7 +46,7 @@ msgstr "Remoção falhou" #: js/settings.js:82 msgid "Take over settings from recent server configuration?" -msgstr "" +msgstr "Tomar parámetros de recente configuração de servidor?" #: js/settings.js:83 msgid "Keep settings?" diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po index 653dc5d233..87268e151a 100644 --- a/l10n/pt_PT/files_trashbin.po +++ b/l10n/pt_PT/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: Mouxy \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Não foi possível eliminar %s de forma permanente" @@ -28,35 +28,39 @@ msgstr "Não foi possível eliminar %s de forma permanente" msgid "Couldn't restore %s" msgstr "Não foi possível restaurar %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "Restaurar" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "Eliminar permanentemente o(s) ficheiro(s)" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nome" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Apagado" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 pasta" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} pastas" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 ficheiro" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} ficheiros" @@ -67,3 +71,7 @@ msgstr "Não ha ficheiros. O lixo está vazio" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Restaurar" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po index 441c56d598..11f9c763ef 100644 --- a/l10n/ro/files_trashbin.po +++ b/l10n/ro/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Nume" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 folder" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} foldare" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 fisier" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} fisiere" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po index cef3725c58..0ad24b090e 100644 --- a/l10n/ru/files_trashbin.po +++ b/l10n/ru/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: Langaru \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "%s не может быть удалён навсегда" @@ -28,35 +28,39 @@ msgstr "%s не может быть удалён навсегда" msgid "Couldn't restore %s" msgstr "%s не может быть восстановлен" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "выполнить операцию восстановления" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "удалить файл навсегда" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Имя" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Удалён" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 папка" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} папок" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 файл" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} файлов" @@ -67,3 +71,7 @@ msgstr "Здесь ничего нет. Ваша корзина пуста!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Восстановить" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ru_RU/files_trashbin.po b/l10n/ru_RU/files_trashbin.po index 987521a796..f628f06dec 100644 --- a/l10n/ru_RU/files_trashbin.po +++ b/l10n/ru_RU/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: Langaru \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: ru_RU\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "%s не может быть удалён навсегда" @@ -28,35 +28,39 @@ msgstr "%s не может быть удалён навсегда" msgid "Couldn't restore %s" msgstr "%s не может быть восстановлен" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "выполнить операцию восстановления" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "удалить файл навсегда" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Имя" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Удалён" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 папка" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{количество} папок" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 файл" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{количество} файлов" @@ -67,3 +71,7 @@ msgstr "Здесь ничего нет. Ваша корзина пуста!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Восстановить" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/si_LK/files_trashbin.po b/l10n/si_LK/files_trashbin.po index e19b02db18..da9e298b80 100644 --- a/l10n/si_LK/files_trashbin.po +++ b/l10n/si_LK/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: si_LK\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "නම" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 ෆොල්ඩරයක්" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 ගොනුවක්" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/sk/files_trashbin.po b/l10n/sk/files_trashbin.po index 8655044756..99f8cea940 100644 --- a/l10n/sk/files_trashbin.po +++ b/l10n/sk/files_trashbin.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-09 00:12+0100\n" -"PO-Revision-Date: 2013-01-31 16:03+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,7 +17,7 @@ msgstr "" "Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po index c1d5863d67..bf92afc5fa 100644 --- a/l10n/sk_SK/files_trashbin.po +++ b/l10n/sk_SK/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 09:50+0000\n" -"Last-Translator: mhh \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +19,7 @@ msgstr "" "Language: sk_SK\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Nemožno zmazať %s navždy" @@ -29,35 +29,39 @@ msgstr "Nemožno zmazať %s navždy" msgid "Couldn't restore %s" msgstr "Nemožno obnoviť %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "vykonať obnovu" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "trvalo zmazať súbor" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Meno" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Zmazané" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 priečinok" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} priečinkov" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 súbor" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} súborov" @@ -68,3 +72,7 @@ msgstr "Žiadny obsah. Kôš je prázdny!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Obnoviť" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po index 6bcfe28d48..4d498e2143 100644 --- a/l10n/sl/files_trashbin.po +++ b/l10n/sl/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Ime" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 mapa" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} map" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 datoteka" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} datotek" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/sr/files_trashbin.po b/l10n/sr/files_trashbin.po index 4e1a43a049..90efd4e628 100644 --- a/l10n/sr/files_trashbin.po +++ b/l10n/sr/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ msgstr "" "Language: sr\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -28,35 +28,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "врати у претходно стање" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Име" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Обрисано" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 фасцикла" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} фасцикле/и" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 датотека" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} датотеке/а" @@ -67,3 +71,7 @@ msgstr "Овде нема ништа. Корпа за отпатке је пра #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Врати" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po index a96b8aed4f..3e8b5838ae 100644 --- a/l10n/sr@latin/files_trashbin.po +++ b/l10n/sr@latin/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: sr@latin\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Ime" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po index 94410d99b9..552ab178fe 100644 --- a/l10n/sv/files_trashbin.po +++ b/l10n/sv/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: Magnus Höglund \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +19,7 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Kunde inte radera %s permanent" @@ -29,35 +29,39 @@ msgstr "Kunde inte radera %s permanent" msgid "Couldn't restore %s" msgstr "Kunde inte återställa %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "utför återställning" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "radera filen permanent" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Namn" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Raderad" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 mapp" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} mappar" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 fil" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} filer" @@ -68,3 +72,7 @@ msgstr "Ingenting här. Din papperskorg är tom!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Återskapa" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/sw_KE/files_trashbin.po b/l10n/sw_KE/files_trashbin.po index 91113e58ba..b7f7223929 100644 --- a/l10n/sw_KE/files_trashbin.po +++ b/l10n/sw_KE/files_trashbin.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-02-08 00:10+0100\n" -"PO-Revision-Date: 2013-02-07 23:11+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: sw_KE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/ta_LK/files_trashbin.po b/l10n/ta_LK/files_trashbin.po index aa8e568266..a58afea6b4 100644 --- a/l10n/ta_LK/files_trashbin.po +++ b/l10n/ta_LK/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: ta_LK\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "பெயர்" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 கோப்புறை" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{எண்ணிக்கை} கோப்புறைகள்" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 கோப்பு" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{எண்ணிக்கை} கோப்புகள்" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index bd782be12d..02df7b5a05 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-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -386,7 +386,7 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:47 +#: lostpassword/controller.php:48 msgid "ownCloud password reset" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 7d45d571c9..8f2efdd443 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-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -90,8 +90,8 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407 -#: js/files.js:438 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 +#: js/files.js:439 msgid "Pending" msgstr "" @@ -149,74 +149,74 @@ msgstr "" msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:224 +#: js/files.js:225 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:261 +#: js/files.js:262 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "" -#: js/files.js:261 +#: js/files.js:262 msgid "Upload Error" msgstr "" -#: js/files.js:272 +#: js/files.js:273 msgid "Close" msgstr "" -#: js/files.js:311 +#: js/files.js:312 msgid "1 file uploading" msgstr "" -#: js/files.js:314 js/files.js:369 js/files.js:384 +#: js/files.js:315 js/files.js:370 js/files.js:385 msgid "{count} files uploading" msgstr "" -#: js/files.js:387 js/files.js:422 +#: js/files.js:388 js/files.js:423 msgid "Upload cancelled." msgstr "" -#: js/files.js:496 +#: js/files.js:497 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:569 +#: js/files.js:570 msgid "URL cannot be empty." msgstr "" -#: js/files.js:574 +#: js/files.js:575 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "" -#: js/files.js:948 templates/index.php:67 +#: js/files.js:949 templates/index.php:67 msgid "Name" msgstr "" -#: js/files.js:949 templates/index.php:78 +#: js/files.js:950 templates/index.php:78 msgid "Size" msgstr "" -#: js/files.js:950 templates/index.php:80 +#: js/files.js:951 templates/index.php:80 msgid "Modified" msgstr "" -#: js/files.js:969 +#: js/files.js:970 msgid "1 folder" msgstr "" -#: js/files.js:971 +#: js/files.js:972 msgid "{count} folders" msgstr "" -#: js/files.js:979 +#: js/files.js:980 msgid "1 file" msgstr "" -#: js/files.js:981 +#: js/files.js:982 msgid "{count} files" msgstr "" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index b27519c01e..cc8e3d0e29 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-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 6e98b59654..d6eea5a457 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-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index c1f7c6dcd2..2741ea4adf 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-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 0e34b311a8..c54923762d 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-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ajax/delete.php:24 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 0339eb0917..fa264617a0 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-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 53147fb1c5..3c8268ee92 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-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 6403daf074..5191c36b21 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-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index cbc32af413..a8cee2070d 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-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 15865d8de3..03867180c9 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-02-20 00:02+0100\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po index b7f0801c5e..f97e95d398 100644 --- a/l10n/th_TH/files_trashbin.po +++ b/l10n/th_TH/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ msgstr "" "Language: th_TH\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -28,35 +28,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "ดำเนินการคืนค่า" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "ชื่อ" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "ลบแล้ว" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 โฟลเดอร์" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} โฟลเดอร์" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 ไฟล์" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} ไฟล์" @@ -67,3 +71,7 @@ msgstr "ไม่มีอะไรอยู่ในนี้ ถังขย #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "คืนค่า" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po index 22a2d9527f..2283359981 100644 --- a/l10n/tr/files_trashbin.po +++ b/l10n/tr/files_trashbin.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-02-19 00:05+0100\n" -"PO-Revision-Date: 2013-02-18 20:10+0000\n" -"Last-Translator: atakan96 \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: tr\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "%s Kalıcı olarak silinemedi" @@ -28,35 +28,39 @@ msgstr "%s Kalıcı olarak silinemedi" msgid "Couldn't restore %s" msgstr "%s Geri yüklenemedi" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "Geri yükleme işlemini gerçekleştir" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "Dosyayı kalıcı olarak sil" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "İsim" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Silindi" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 dizin" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} dizin" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 dosya" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} dosya" @@ -67,3 +71,7 @@ msgstr "Burası boş. Çöp kutun tamamen boş." #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Geri yükle" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po index 7f2bd9d813..aaaca834b6 100644 --- a/l10n/uk/files_trashbin.po +++ b/l10n/uk/files_trashbin.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-02-20 00:02+0100\n" -"PO-Revision-Date: 2013-02-19 14:20+0000\n" -"Last-Translator: volodya327 \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: uk\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ajax/delete.php:24 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Неможливо видалити %s назавжди" @@ -28,35 +28,39 @@ msgstr "Неможливо видалити %s назавжди" msgid "Couldn't restore %s" msgstr "Неможливо відновити %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "виконати операцію відновлення" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "видалити файл назавжди" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Ім'я" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Видалено" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 папка" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} папок" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 файл" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} файлів" @@ -67,3 +71,7 @@ msgstr "Нічого немає. Ваший кошик для сміття пу #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Відновити" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po index c5b1c4de22..c4ebe67d89 100644 --- a/l10n/vi/files_trashbin.po +++ b/l10n/vi/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" -"Last-Translator: saosangm \n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "Không thể óa %s vĩnh viễn" @@ -28,35 +28,39 @@ msgstr "Không thể óa %s vĩnh viễn" msgid "Couldn't restore %s" msgstr "Không thể khôi phục %s" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "thực hiện phục hồi" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "xóa file vĩnh viễn" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "Tên" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "Đã xóa" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 thư mục" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} thư mục" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 tập tin" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} tập tin" @@ -67,3 +71,7 @@ msgstr "Không có gì ở đây. Thùng rác của bạn rỗng!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "Khôi phục" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/zh_CN.GB2312/files_trashbin.po b/l10n/zh_CN.GB2312/files_trashbin.po index 4432759cfe..2b3b09a9e1 100644 --- a/l10n/zh_CN.GB2312/files_trashbin.po +++ b/l10n/zh_CN.GB2312/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: zh_CN.GB2312\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "名称" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 个文件夹" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} 个文件夹" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 个文件" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} 个文件" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po index 74ce3be6ba..a2f415f760 100644 --- a/l10n/zh_CN/files_trashbin.po +++ b/l10n/zh_CN/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "名称" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1个文件夹" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} 个文件夹" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 个文件" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} 个文件" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po index 4d46282475..3619584ba4 100644 --- a/l10n/zh_HK/files_trashbin.po +++ b/l10n/zh_HK/files_trashbin.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-02-08 00:10+0100\n" -"PO-Revision-Date: 2013-02-07 23:11+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: zh_HK\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po index ae0e1da91d..347608bd4e 100644 --- a/l10n/zh_TW/files_trashbin.po +++ b/l10n/zh_TW/files_trashbin.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-02-12 15:10+0100\n" -"PO-Revision-Date: 2013-02-12 10:07+0000\n" +"POT-Creation-Date: 2013-02-21 00:14+0100\n" +"PO-Revision-Date: 2013-02-20 23:14+0000\n" "Last-Translator: I Robot \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/delete.php:22 +#: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" msgstr "" @@ -27,35 +27,39 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:94 +#: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" msgstr "" -#: js/trash.js:33 +#: js/trash.js:34 msgid "delete file permanently" msgstr "" -#: js/trash.js:125 templates/index.php:17 +#: js/trash.js:121 +msgid "Delete permanently" +msgstr "" + +#: js/trash.js:151 templates/index.php:17 msgid "Name" msgstr "名稱" -#: js/trash.js:126 templates/index.php:27 +#: js/trash.js:152 templates/index.php:27 msgid "Deleted" msgstr "" -#: js/trash.js:135 +#: js/trash.js:161 msgid "1 folder" msgstr "1 個資料夾" -#: js/trash.js:137 +#: js/trash.js:163 msgid "{count} folders" msgstr "{count} 個資料夾" -#: js/trash.js:145 +#: js/trash.js:171 msgid "1 file" msgstr "1 個檔案" -#: js/trash.js:147 +#: js/trash.js:173 msgid "{count} files" msgstr "{count} 個檔案" @@ -66,3 +70,7 @@ msgstr "" #: templates/index.php:20 templates/index.php:22 msgid "Restore" msgstr "" + +#: templates/index.php:30 templates/index.php:31 +msgid "Delete" +msgstr "" diff --git a/lib/l10n/de.php b/lib/l10n/de.php index 0ad254ad84..87b0b29469 100644 --- a/lib/l10n/de.php +++ b/lib/l10n/de.php @@ -9,7 +9,7 @@ "Files need to be downloaded one by one." => "Die Dateien müssen einzeln heruntergeladen werden.", "Back to Files" => "Zurück zu \"Dateien\"", "Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen.", -"couldn't be determined" => "Konnte nicht festgestellt werden", +"couldn't be determined" => "konnte nicht festgestellt werden", "Application is not enabled" => "Die Anwendung ist nicht aktiviert", "Authentication error" => "Authentifizierungs-Fehler", "Token expired. Please reload page." => "Token abgelaufen. Bitte lade die Seite neu.", @@ -18,7 +18,7 @@ "Images" => "Bilder", "Set an admin username." => "Setze Administrator Benutzername.", "Set an admin password." => "Setze Administrator Passwort", -"Specify a data folder." => "Datei-Verzeichnis angeben", +"Specify a data folder." => "Datei-Verzeichnis angeben.", "%s enter the database username." => "%s gib den Datenbank-Benutzernamen an.", "%s enter the database name." => "%s gib den Datenbank-Namen an.", "%s you may not use dots in the database name" => "%s Der Datenbank-Name darf keine Punkte enthalten", @@ -32,7 +32,7 @@ "MySQL user '%s'@'localhost' exists already." => "MySQL Benutzer '%s'@'localhost' existiert bereits.", "Drop this user from MySQL" => "Lösche diesen Benutzer von MySQL", "MySQL user '%s'@'%%' already exists" => "MySQL Benutzer '%s'@'%%' existiert bereits", -"Drop this user from MySQL." => "Lösche diesen Benutzer von MySQL.", +"Drop this user from MySQL." => "Lösche diesen Benutzer aus MySQL.", "Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.", "Please double check the installation guides." => "Bitte prüfe die Instalationsanleitungen.", diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php index 1f63fdd87b..d04c691f7e 100644 --- a/lib/l10n/de_DE.php +++ b/lib/l10n/de_DE.php @@ -30,9 +30,9 @@ "DB Error: \"%s\"" => "DB Fehler: \"%s\"", "Offending command was: \"%s\"" => "Fehlerhafter Befehl war: \"%s\"", "MySQL user '%s'@'localhost' exists already." => "MySQL Benutzer '%s'@'localhost' existiert bereits.", -"Drop this user from MySQL" => "Lösche diesen Benutzer von MySQL", +"Drop this user from MySQL" => "Lösche diesen Benutzer aus MySQL", "MySQL user '%s'@'%%' already exists" => "MySQL Benutzer '%s'@'%%' existiert bereits", -"Drop this user from MySQL." => "Lösche diesen Benutzer von MySQL.", +"Drop this user from MySQL." => "Lösche diesen Benutzer aus MySQL.", "Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.", "Please double check the installation guides." => "Bitte prüfen Sie die Instalationsanleitungen.", diff --git a/lib/l10n/my_MM.php b/lib/l10n/my_MM.php new file mode 100644 index 0000000000..8d5485a4a5 --- /dev/null +++ b/lib/l10n/my_MM.php @@ -0,0 +1,3 @@ + "Apps" +); diff --git a/settings/l10n/de.php b/settings/l10n/de.php index 4b8ee76e76..42992855ec 100644 --- a/settings/l10n/de.php +++ b/settings/l10n/de.php @@ -36,7 +36,7 @@ "A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden", "__language_name__" => "Deutsch (Persönlich)", "Security Warning" => "Sicherheitswarnung", -"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." => "Dein Datenverzeichnis und deine Datein sind vielleicht vom Internet aus erreichbar. Die .htaccess Datei, die ownCloud verwendet, arbeitet nicht richtig. Wir schlagen Dir dringend vor, dass du deinen Webserver so konfigurierst, dass das Datenverzeichnis nicht länger erreichbar ist oder, dass du dein Datenverzeichnis aus dem Dokumenten-root des Webservers bewegst.", +"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." => "Dein Datenverzeichnis und Deine Datein sind vielleicht vom Internet aus erreichbar. Die .htaccess Datei, die ownCloud verwendet, arbeitet nicht richtig. Wir schlagen Dir dringend vor, dass Du Deinen Webserver so konfigurierst, dass das Datenverzeichnis nicht länger erreichbar ist oder, dass Du Dein Datenverzeichnis aus dem Dokumenten-root des Webservers bewegst.", "Setup Warning" => "Einrichtungswarnung", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.", "Please double check the installation guides." => "Bitte prüfen Sie die Instalationsanleitungen.", @@ -45,14 +45,14 @@ "Locale not working" => "Ländereinstellung funktioniert nicht", "This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8." => "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 benötigten Pakete auf ihrem System zu installieren.", "Internet connection not working" => "Keine Netzwerkverbindung", -"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." => "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen.", +"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." => "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Du alle Funktionen von ownCloud nutzen möchtest.", "Cron" => "Cron", "Execute one task with each page loaded" => "Führe eine Aufgabe mit jeder geladenen Seite aus", "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ist an einem Webcron-Service registriert. Die cron.php Seite wird einmal pro Minute über http abgerufen.", "Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Nutze den Cron Systemdienst. Rufe die Datei cron.php im owncloud Ordner einmal pro Minute über einen Cronjob auf.", "Sharing" => "Teilen", "Enable Share API" => "Aktiviere Sharing-API", -"Allow apps to use the Share API" => "Erlaube Apps die Nutzung der Sharing-API", +"Allow apps to use the Share API" => "Erlaube Apps die Nutzung der Share-API", "Allow links" => "Erlaube Links", "Allow users to share items to the public with links" => "Erlaube Benutzern Inhalte über öffentliche Links zu teilen", "Allow resharing" => "Erlaube erneutes teilen", @@ -64,7 +64,7 @@ "Enforces the clients to connect to ownCloud via an encrypted connection." => "Erzwingt die Verwendung einer verschlüsselten Verbindung", "Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinden Sie sich über eine HTTPS Verbindung mit diesem ownCloud Server um diese Einstellung zu ändern", "Log" => "Log", -"Log level" => "Logtiefe", +"Log level" => "Loglevel", "More" => "Mehr", "Version" => "Version", "Developed by the ownCloud community, the source code is licensed under the AGPL." => "Entwickelt von der ownCloud-Community, der Quellcode ist unter der AGPL lizenziert.", @@ -81,7 +81,7 @@ "Bugtracker" => "Bugtracker", "Commercial Support" => "Kommerzieller Support", "You have used %s of the available %s" => "Du verwendest %s der verfügbaren %s", -"Get the apps to sync your files" => "Laden Sie die Apps zur Synchronisierung ihrer Daten herunter", +"Get the apps to sync your files" => "Lade die Apps zur Synchronisierung Deiner Daten herunter", "Show First Run Wizard again" => "Erstinstallation erneut durchführen", "Password" => "Passwort", "Your password was changed" => "Dein Passwort wurde geändert.", diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php index ee23510536..5dd5001548 100644 --- a/settings/l10n/de_DE.php +++ b/settings/l10n/de_DE.php @@ -43,16 +43,16 @@ "Module 'fileinfo' missing" => "Das Modul 'fileinfo' fehlt", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.", "Locale not working" => "Lokalisierung funktioniert nicht", -"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8." => "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 benötigten Pakete auf ihrem System zu installieren.", +"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". 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 en_US.UTF-8/en_US.UTF8." => "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen im Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 benötigten Pakete auf Ihrem System zu installieren.", "Internet connection not working" => "Keine Netzwerkverbindung", -"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." => "Dieser ownCloud Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie das einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen.", +"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." => "Dieser ownCloud Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen.", "Cron" => "Cron", "Execute one task with each page loaded" => "Führe eine Aufgabe bei jedem Laden der Seite aus", "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ist bei einem Webcron-Service registriert. Die cron.php Seite im ownCloud Wurzelverzeichniss wird einmal pro Minute über http abgerufen.", "Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Nutzen Sie den Cron Systemdienst. Rufen Sie die Datei cron.php im ownCloud Ordner einmal pro Minute über einen Cronjob auf.", "Sharing" => "Teilen", -"Enable Share API" => "Teilen-API aktivieren", -"Allow apps to use the Share API" => "Erlaube es Anwendungen, die Teilen-API zu benutzen", +"Enable Share API" => "Share-API aktivieren", +"Allow apps to use the Share API" => "Erlaube es Anwendungen, die Share-API zu benutzen", "Allow links" => "Links erlauben", "Allow users to share items to the public with links" => "Erlaube es Benutzern, Items per öffentlichem Link zu teilen", "Allow resharing" => "Erlaube weiterverteilen", diff --git a/settings/l10n/es.php b/settings/l10n/es.php index e0c20c6d97..ec805cca3c 100644 --- a/settings/l10n/es.php +++ b/settings/l10n/es.php @@ -34,6 +34,7 @@ "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." => "Su directorio de datos y sus archivos están probablemente accesibles desde internet. El archivo .htaccess que ownCloud provee no está funcionando. Sugerimos fuertemente que configure su servidor web de manera que el directorio de datos ya no esté accesible o mueva el directorio de datos fuera del documento raíz de su servidor web.", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.", "Please double check the installation guides." => "Por favor, vuelva a comprobar las guías de instalación.", +"Sharing" => "Compartiendo", "More" => "Más", "Version" => "Version", "Developed by the ownCloud community, the source code is licensed under the AGPL." => "Desarrollado por la comunidad ownCloud, el código fuente está bajo licencia AGPL.", diff --git a/settings/l10n/id.php b/settings/l10n/id.php index e62b3e15a7..7f53a50b24 100644 --- a/settings/l10n/id.php +++ b/settings/l10n/id.php @@ -20,6 +20,7 @@ "Select an App" => "Pilih satu aplikasi", "See application page at apps.owncloud.com" => "Lihat halaman aplikasi di apps.owncloud.com", "Update" => "Pembaruan", +"Get the apps to sync your files" => "Dapatkan aplikasi untuk sinkronisasi berkas anda", "Password" => "Password", "Unable to change your password" => "Tidak dapat merubah password anda", "Current password" => "Password saat ini", From c5e0dda8874244ac3c9acdf92bfd5e97405438c0 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Thu, 21 Feb 2013 11:09:00 +0100 Subject: [PATCH 045/103] add a safe_mode check --- lib/util.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/util.php b/lib/util.php index ab47e404c9..87facda180 100755 --- a/lib/util.php +++ b/lib/util.php @@ -269,6 +269,11 @@ class OC_Util { 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } + if(ini_get('safe_mode')) { + $errors[]=array('error'=>'PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly.
', + 'hint'=>'PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.'); + $web_server_restart= false; + } $handler = ini_get("session.save_handler"); if($handler == "files") { From c24ec867f9e428dd90c021736c2d92c0516e3526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 21 Feb 2013 12:20:29 +0100 Subject: [PATCH 046/103] calculate versions size per user --- apps/files_versions/appinfo/database.xml | 35 ++++++++++++++++ apps/files_versions/appinfo/version | 2 +- apps/files_versions/lib/versions.php | 53 ++++++++++++++++++++---- 3 files changed, 80 insertions(+), 10 deletions(-) create mode 100644 apps/files_versions/appinfo/database.xml diff --git a/apps/files_versions/appinfo/database.xml b/apps/files_versions/appinfo/database.xml new file mode 100644 index 0000000000..7cfa5aa79a --- /dev/null +++ b/apps/files_versions/appinfo/database.xml @@ -0,0 +1,35 @@ + + + + *dbname* + true + false + + utf8 + + + + *dbprefix*files_versions + + + + + user + text + + true + 50 + + + size + text + + true + 50 + + + + +
+ + diff --git a/apps/files_versions/appinfo/version b/apps/files_versions/appinfo/version index e6d5cb833c..e4c0d46e55 100644 --- a/apps/files_versions/appinfo/version +++ b/apps/files_versions/appinfo/version @@ -1 +1 @@ -1.0.2 \ No newline at end of file +1.0.3 \ No newline at end of file diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index ba9f8ba41c..415830a9a0 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -45,6 +45,37 @@ class Storage { return array($uid, $filename); } + /** + * get current size of all versions from a given user + * + * @param $user user who owns the versions + * @return mixed versions size or false if no versions size is stored + */ + private static function getVersionsSize($user) { + $query = \OC_DB::prepare('SELECT size FROM *PREFIX*files_versions WHERE user=?'); + $result = $query->execute(array($user))->fetchAll(); + + if ($result) { + return $result[0]['size']; + } + return false; + } + + /** + * write to the database how much space is in use for versions + * + * @param $user owner of the versions + * @param $size size of the versions + */ + private static function setVersionsSize($user, $size) { + if ( self::getVersionsSize($user) === false) { + $query = \OC_DB::prepare('INSERT INTO *PREFIX*files_versions (size, user) VALUES (?, ?)'); + }else { + $query = \OC_DB::prepare('UPDATE *PREFIX*files_versions SET size=? WHERE user=?'); + } + $query->execute(array($size, $user)); + } + /** * store a new version of a file. */ @@ -73,17 +104,19 @@ class Storage { } // store a new version of a file - $result = $users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename)); - if ( ($versionsSize = \OCP\Config::getAppValue('files_versions', 'size')) === null ) { + $users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename)); + $versionsSize = self::getVersionsSize($uid); + if ( $versionsSize === false || $versionSize < 0 ) { $versionsSize = self::calculateSize($uid); } + $versionsSize += $users_view->filesize('files'.$filename); - + // expire old revisions if necessary $newSize = self::expire($filename, $versionsSize); - + if ( $newSize != $versionsSize ) { - \OCP\Config::setAppValue('files_versions', 'size', $versionsSize); + self::setVersionsSize($uid, $newSize); } } } @@ -98,14 +131,15 @@ class Storage { $abs_path = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$filename.'.v'; if( ($versions = self::getVersions($uid, $filename)) ) { - if ( ($versionsSize = \OCP\Config::getAppValue('files_versions', 'size')) === null ) { + $versionsSize = self::getVersionsSize($uid); + if ( $versionsSize === false || $versionsSize < 0 ) { $versionsSize = self::calculateSize($uid); } foreach ($versions as $v) { unlink($abs_path . $v['version']); $versionsSize -= $v['size']; } - \OCP\Config::setAppValue('files_versions', 'size', $versionsSize); + self::setVersionsSize($uid, $versionsSize); } } @@ -314,12 +348,13 @@ class Storage { $quota = \OCP\Util::computerFileSize(\OC_Appconfig::getValue('files', 'default_quota')); } if ( $quota == null ) { - $quota = \OC\Files\Filesystem::free_space('/'); + $quota = \OC\Files\Filesystem::free_space('/') / count(\OCP\User::getUsers()); } // make sure that we have the current size of the version history if ( $versionsSize === null ) { - if ( ($versionsSize = \OCP\Config::getAppValue('files_versions', 'size')) === null ) { + $versionsSize = self::getVersionsSize($uid); + if ( $versionsSize === false || $versionsSize < 0 ) { $versionsSize = self::calculateSize($uid); } } From 2436d01985311b3cd14c2f0dec745081ae7d3507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 21 Feb 2013 12:37:13 +0100 Subject: [PATCH 047/103] calculate trashbin size per user --- apps/files_trashbin/appinfo/database.xml | 26 ++++++++++++ apps/files_trashbin/appinfo/version | 2 +- apps/files_trashbin/lib/trash.php | 52 ++++++++++++++++++++---- 3 files changed, 71 insertions(+), 9 deletions(-) diff --git a/apps/files_trashbin/appinfo/database.xml b/apps/files_trashbin/appinfo/database.xml index 1144a1c9a9..6f2a27866f 100644 --- a/apps/files_trashbin/appinfo/database.xml +++ b/apps/files_trashbin/appinfo/database.xml @@ -89,4 +89,30 @@ + + + *dbprefix*files_trashsize + + + + + user + text + + true + 50 + + + + size + text + + true + 50 + + + + +
+ diff --git a/apps/files_trashbin/appinfo/version b/apps/files_trashbin/appinfo/version index 49d59571fb..be58634173 100644 --- a/apps/files_trashbin/appinfo/version +++ b/apps/files_trashbin/appinfo/version @@ -1 +1 @@ -0.1 +0.3 diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 8d54a471b4..898f897273 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -52,8 +52,9 @@ class Trashbin { } else { $type = 'file'; } - - if ( ($trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size')) === null ) { + + $trashbinSize = self::getTrashbinSize($user); + if ( $trashbinSize === false || $trashbinSize < 0 ) { $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin')); $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/versions_trashbin')); } @@ -89,7 +90,7 @@ class Trashbin { $quota = \OCP\Util::computerFileSize(\OC_Appconfig::getValue('files', 'default_quota')); } if ( $quota == null ) { - $quota = \OC\Files\Filesystem::free_space('/'); + $quota = \OC\Files\Filesystem::free_space('/') / count(\OCP\User::getUsers()); } // calculate available space for trash bin @@ -102,7 +103,8 @@ class Trashbin { } $trashbinSize -= self::expire($availableSpace); - \OCP\Config::setAppValue('files_trashbin', 'size', $trashbinSize); + + self::setTrashbinSize($user, $trashbinSize); } @@ -116,7 +118,8 @@ class Trashbin { $user = \OCP\User::getUser(); $view = new \OC_FilesystemView('/'.$user); - if ( ($trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size')) === null ) { + $trashbinSize = self::getTrashbinSize($user); + if ( $trashbinSize === false || $trashbinSize < 0 ) { $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin')); $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/versions_trashbin')); } @@ -185,7 +188,8 @@ class Trashbin { $query->execute(array($user,$filename,$timestamp)); } - \OCP\Config::setAppValue('files_trashbin', 'size', $trashbinSize); + self::setTrashbinSize($user, $trashbinSize); + return true; } else { \OC_Log::write('files_trashbin', 'Couldn\'t restore file from trash bin, '.$filename, \OC_log::ERROR); @@ -205,7 +209,8 @@ class Trashbin { $view = new \OC_FilesystemView('/'.$user); $size = 0; - if ( ($trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size')) === null ) { + $trashbinSize = self::getTrashbinSize($user); + if ( $trashbinSize === false || $trashbinSize < 0 ) { $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin')); $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/versions_trashbin')); } @@ -242,7 +247,7 @@ class Trashbin { } $view->unlink('/files_trashbin/'.$file); $trashbinSize -= $size; - \OCP\Config::setAppValue('files_trashbin', 'size', $trashbinSize); + self::setTrashbinSize($user, $trashbinSize); return $size; } @@ -429,5 +434,36 @@ class Trashbin { } return $size; } + + /** + * get current size of trash bin from a given user + * + * @param $user user who owns the trash bin + * @return mixed trash bin size or false if no trash bin size is stored + */ + private static function getTrashbinSize($user) { + $query = \OC_DB::prepare('SELECT size FROM *PREFIX*files_trashsize WHERE user=?'); + $result = $query->execute(array($user))->fetchAll(); + + if ($result) { + return $result[0]['size']; + } + return false; + } + + /** + * write to the database how much space is in use for the trash bin + * + * @param $user owner of the trash bin + * @param $size size of the trash bin + */ + private static function setTrashbinSize($user, $size) { + if ( self::getTrashbinSize($user) === false) { + $query = \OC_DB::prepare('INSERT INTO *PREFIX*files_trashsize (size, user) VALUES (?, ?)'); + }else { + $query = \OC_DB::prepare('UPDATE *PREFIX*files_trashsize SET size=? WHERE user=?'); + } + $query->execute(array($size, $user)); + } } From 0a5457c5506730bf75a319b74a5bc97169da36d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 21 Feb 2013 14:40:16 +0100 Subject: [PATCH 048/103] fix getVersions(), we need to get the correct user and filename --- apps/files_versions/ajax/getVersions.php | 4 ++-- apps/files_versions/lib/versions.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php index 53fc04625c..8a8fa43080 100644 --- a/apps/files_versions/ajax/getVersions.php +++ b/apps/files_versions/ajax/getVersions.php @@ -1,11 +1,11 @@ 604800), ); - private static function getUidAndFilename($filename) { + public static function getUidAndFilename($filename) { $uid = \OC\Files\Filesystem::getOwner($filename); if ( $uid != \OCP\User::getUser() ) { $info = \OC\Files\Filesystem::getFileInfo($filename); From eceb7341bb48edae49bec93f5df58f04c9eb99ab Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 21 Feb 2013 16:25:47 +0100 Subject: [PATCH 049/103] make number-input fields look like they should --- core/css/styles.css | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 8a01211d8b..0c16b36873 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -36,8 +36,8 @@ filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endC .header-right > * { vertical-align:middle; } /* INPUTS */ -input[type="text"], input[type="password"] { cursor:text; } -input[type="text"], input[type="password"], input[type="search"], +input[type="text"], input[type="password"], input[type="number"] { cursor:text; } +input[type="text"], input[type="password"], input[type="search"], input[type="number"], textarea, select, button, .button, #quota, div.jp-progress, .pager li a { width:10em; margin:.3em; padding:.6em .5em .4em; font-size:1em; font-family:Arial, Verdana, sans-serif; @@ -46,10 +46,11 @@ textarea, select, button, .button, #quota, div.jp-progress, .pager li a { -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; } input[type="hidden"] { height:0; width:0; } -input[type="text"], input[type="password"], input[type="search"], textarea { background:#f8f8f8; color:#555; cursor:text; } -input[type="text"], input[type="password"], input[type="search"] { -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; } +input[type="text"], input[type="password"], input[type="search"], input[type="number"], textarea { background:#f8f8f8; color:#555; cursor:text; } +input[type="text"], input[type="password"], input[type="search"], input[type="number"] { -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; } input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active, input[type="password"]:hover, input[type="password"]:focus, input[type="password"]:active, +input[type="number"]:hover, input[type="number"]:focus, input[type="number"]:active, .searchbox input[type="search"]:hover, .searchbox input[type="search"]:focus, .searchbox input[type="search"]:active, textarea:hover, textarea:focus, textarea:active { background-color:#fff; color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; } @@ -196,7 +197,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } #show, #personal-show { display:none; } #show + label { right:1em; top:1.25em!important; } #show:checked + label, #personal-show:checked + label { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; } -#show + label, #personal-show + label { +#show + 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; From 89ef06cd799a59f113a354a4fd0311d4e479fe36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 21 Feb 2013 16:34:22 +0100 Subject: [PATCH 050/103] rename app to 'deleted files' --- apps/files_trashbin/appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml index e421733960..7f807da579 100644 --- a/apps/files_trashbin/appinfo/info.xml +++ b/apps/files_trashbin/appinfo/info.xml @@ -1,7 +1,7 @@ files_trashbin - Trash bin + Deleted files Keep a copy of deleted files so that they can be restored if needed AGPL Bjoern Schiessle From 859caee66a107b7e46f3d0bc615acfd112a2981d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Thu, 21 Feb 2013 16:52:18 +0100 Subject: [PATCH 051/103] use :hover pseudo class to set opacity --- apps/files/css/files.css | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index dfc2e4c0e2..3cd809038b 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -123,6 +123,24 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; } .selectedActions a { display:inline; margin:-.5em 0; padding:.5em !important; } .selectedActions a img { position:relative; top:.3em; } +#fileList a.action { + display:none; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; + filter: alpha(opacity=0); + opacity: 0; +} +#fileList tr:hover a.action { + display:inline; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=.5)"; + filter: alpha(opacity=.5); + opacity: .5; +} +#fileList tr:hover a.action:hover { + display:inline; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=1)"; + filter: alpha(opacity=1); + opacity: 1; +} #scanning-message{ top:40%; left:40%; position:absolute; display:none; } From 0dd7fd0599e0757abc81677ccbb8d4a6839a5f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Thu, 21 Feb 2013 17:38:25 +0100 Subject: [PATCH 052/103] IE8 does not support window.onclick --- apps/files/js/files.js | 2 +- core/js/js.js | 2 +- search/js/result.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 8327460cca..aeb7aedfae 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -524,7 +524,7 @@ $(document).ready(function() { crumb.text(text); } - $(window).click(function(){ + $(document).click(function(){ $('#new>ul').hide(); $('#new').removeClass('active'); $('#new li').each(function(i,element){ diff --git a/core/js/js.js b/core/js/js.js index 6d5d65403f..e373fca886 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -669,7 +669,7 @@ $(document).ready(function(){ $('#settings #expanddiv').click(function(event){ event.stopPropagation(); }); - $(window).click(function(){//hide the settings menu when clicking outside it + $(document).click(function(){//hide the settings menu when clicking outside it $('#settings #expanddiv').slideUp(200); }); diff --git a/search/js/result.js b/search/js/result.js index cadb0d0aab..78fa8efc8e 100644 --- a/search/js/result.js +++ b/search/js/result.js @@ -28,7 +28,7 @@ OC.search.showResults=function(results){ OC.search.hide(); event.stopPropagation(); }); - $(window).click(function(event){ + $(document).click(function(event){ OC.search.hide(); }); OC.search.lastResults=results; From e7d1bbfae34afce54f7652c815aed7a269d1160e Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 21 Feb 2013 18:20:14 +0100 Subject: [PATCH 053/103] fix giant advanced caret in installation --- core/img/actions/caret-dark.png | Bin 0 -> 256 bytes core/img/actions/caret-dark.svg | 102 ++++++++++++++++++++++++++++++++ core/templates/installation.php | 2 +- 3 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 core/img/actions/caret-dark.png create mode 100644 core/img/actions/caret-dark.svg diff --git a/core/img/actions/caret-dark.png b/core/img/actions/caret-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..ce7e1e6980298b86b6eb5bbf9008ea7dfb67699f GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u@pObhHwBu4M$1`kk47*5m^jW ze;tGwoit`w00kvWTq8(3{0JJ<;>(%z3q(K9nDUfavC`*#6aC7@ ucWthV%HO>3fAYD?)ema8nY^Qq^8MFhS8 + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/core/templates/installation.php b/core/templates/installation.php index b3b7cfc4b8..9cb1d4600d 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -49,7 +49,7 @@
- t( 'Advanced' ); ?> + t( 'Advanced' ); ?>
From 88bea55f9736bc0ddd1da5a2e055bd6b3494f73b Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Thu, 21 Feb 2013 21:30:25 +0100 Subject: [PATCH 054/103] Update hint by the internal version number. So we don't repeat the 4.5 <=> 4.90 mixup --- lib/util.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/util.php b/lib/util.php index 5d3286204e..ab47e404c9 100755 --- a/lib/util.php +++ b/lib/util.php @@ -73,8 +73,8 @@ class OC_Util { * @return array */ public static function getVersion() { - // hint: We only can count up. So the internal version number - // of ownCloud 4.5 will be 4.90.0. This is not visible to the user + // hint: We only can count up. Reset minor/patchlevel when + // updating major/minor version number. return array(4, 93, 10); } From 629097bee73d70af002a5277529a7afdca75897d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 21 Feb 2013 22:44:44 +0100 Subject: [PATCH 055/103] increase db fileds for usernames --- apps/files_trashbin/appinfo/database.xml | 4 ++-- apps/files_versions/appinfo/database.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/files_trashbin/appinfo/database.xml b/apps/files_trashbin/appinfo/database.xml index 6f2a27866f..6f12b26d05 100644 --- a/apps/files_trashbin/appinfo/database.xml +++ b/apps/files_trashbin/appinfo/database.xml @@ -26,7 +26,7 @@ text true - 50 + 64 @@ -100,7 +100,7 @@ text true - 50 + 64 diff --git a/apps/files_versions/appinfo/database.xml b/apps/files_versions/appinfo/database.xml index 7cfa5aa79a..d385477698 100644 --- a/apps/files_versions/appinfo/database.xml +++ b/apps/files_versions/appinfo/database.xml @@ -18,7 +18,7 @@ text true - 50 + 64 size From 59a3238d1a0494987546b5ecc14622981b4a2778 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Thu, 14 Feb 2013 22:37:49 +0100 Subject: [PATCH 056/103] Style cleanup files_sharing --- apps/files_sharing/appinfo/update.php | 5 ++++- apps/files_sharing/lib/cache.php | 5 +++-- apps/files_sharing/lib/permissions.php | 3 ++- apps/files_sharing/lib/share/file.php | 14 ++++++++++++-- apps/files_sharing/lib/share/folder.php | 5 +++-- apps/files_sharing/lib/sharedstorage.php | 10 +++++++--- apps/files_sharing/public.php | 7 +++++-- apps/files_sharing/templates/public.php | 20 ++++++++++++++------ 8 files changed, 50 insertions(+), 19 deletions(-) diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php index 1d22b32b50..48e41e9304 100644 --- a/apps/files_sharing/appinfo/update.php +++ b/apps/files_sharing/appinfo/update.php @@ -52,7 +52,10 @@ if (version_compare($installedVersion, '0.3', '<')) { } catch (Exception $e) { $update_error = true; - OCP\Util::writeLog('files_sharing', 'Upgrade Routine: Skipping sharing "'.$row['source'].'" to "'.$shareWith.'" (error is "'.$e->getMessage().'")', OCP\Util::WARN); + OCP\Util::writeLog('files_sharing', + 'Upgrade Routine: Skipping sharing "'.$row['source'].'" to "'.$shareWith + .'" (error is "'.$e->getMessage().'")', + OCP\Util::WARN); } OC_Util::tearDownFS(); } diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index 9655e44787..fb0f6c7b5a 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -71,8 +71,9 @@ class Shared_Cache extends Cache { } } else { $query = \OC_DB::prepare( - 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted` - FROM `*PREFIX*filecache` WHERE `fileid` = ?'); + 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`,' + .' `size`, `mtime`, `encrypted`' + .' FROM `*PREFIX*filecache` WHERE `fileid` = ?'); $result = $query->execute(array($file)); $data = $result->fetchRow(); $data['fileid'] = (int)$data['fileid']; diff --git a/apps/files_sharing/lib/permissions.php b/apps/files_sharing/lib/permissions.php index 2b068ff935..72c1ec96c4 100644 --- a/apps/files_sharing/lib/permissions.php +++ b/apps/files_sharing/lib/permissions.php @@ -33,7 +33,8 @@ class Shared_Permissions extends Permissions { if ($fileId == -1) { return \OCP\PERMISSION_READ; } - $source = \OCP\Share::getItemSharedWithBySource('file', $fileId, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE, null, true); + $source = \OCP\Share::getItemSharedWithBySource('file', $fileId, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE, + null, true); if ($source) { return $source['permissions']; } else { diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php index 6d3c55a008..0aeb763d89 100644 --- a/apps/files_sharing/lib/share/file.php +++ b/apps/files_sharing/lib/share/file.php @@ -72,7 +72,11 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent { public function formatItems($items, $format, $parameters = null) { if ($format == self::FORMAT_SHARED_STORAGE) { // Only 1 item should come through for this format call - return array('path' => $items[key($items)]['path'], 'permissions' => $items[key($items)]['permissions'], 'uid_owner' => $items[key($items)]['uid_owner']); + return array( + 'path' => $items[key($items)]['path'], + 'permissions' => $items[key($items)]['permissions'], + 'uid_owner' => $items[key($items)]['uid_owner'] + ); } else if ($format == self::FORMAT_GET_FOLDER_CONTENTS) { $files = array(); foreach ($items as $item) { @@ -99,7 +103,13 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent { } $size += (int)$item['size']; } - return array('fileid' => -1, 'name' => 'Shared', 'mtime' => $mtime, 'mimetype' => 'httpd/unix-directory', 'size' => $size); + return array( + 'fileid' => -1, + 'name' => 'Shared', + 'mtime' => $mtime, + 'mimetype' => 'httpd/unix-directory', + 'size' => $size + ); } else if ($format == self::FORMAT_OPENDIR) { $files = array(); foreach ($items as $item) { diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php index 11c8c6b1e8..4426beec63 100644 --- a/apps/files_sharing/lib/share/folder.php +++ b/apps/files_sharing/lib/share/folder.php @@ -33,7 +33,8 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share } while (!empty($parents)) { $parents = "'".implode("','", $parents)."'"; - $query = OC_DB::prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache` WHERE `parent` IN ('.$parents.')'); + $query = OC_DB::prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache`' + .' WHERE `parent` IN ('.$parents.')'); $result = $query->execute(); $parents = array(); while ($file = $result->fetchRow()) { @@ -47,4 +48,4 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share return $children; } -} \ No newline at end of file +} diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 65812b7e2f..c7521949da 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -240,7 +240,8 @@ class Shared extends \OC\Files\Storage\Common { public function file_put_contents($path, $data) { if ($source = $this->getSourcePath($path)) { // Check if permission is granted - if (($this->file_exists($path) && !$this->isUpdatable($path)) || ($this->is_dir($path) && !$this->isCreatable($path))) { + if (($this->file_exists($path) && !$this->isUpdatable($path)) + || ($this->is_dir($path) && !$this->isCreatable($path))) { return false; } $info = array( @@ -390,9 +391,12 @@ class Shared extends \OC\Files\Storage\Common { } public static function setup($options) { - if (!\OCP\User::isLoggedIn() || \OCP\User::getUser() != $options['user'] || \OCP\Share::getItemsSharedWith('file')) { + if (!\OCP\User::isLoggedIn() || \OCP\User::getUser() != $options['user'] + || \OCP\Share::getItemsSharedWith('file')) { $user_dir = $options['user_dir']; - \OC\Files\Filesystem::mount('\OC\Files\Storage\Shared', array('sharedFolder' => '/Shared'), $user_dir.'/Shared/'); + \OC\Files\Filesystem::mount('\OC\Files\Storage\Shared', + array('sharedFolder' => '/Shared'), + $user_dir.'/Shared/'); } } diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 38d598f778..f265a7dd01 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -171,7 +171,9 @@ if (isset($path)) { $list->assign('files', $files, false); $list->assign('disableSharing', true); $list->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=', false); - $list->assign('downloadURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=', false); + $list->assign('downloadURL', + OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=', + false); $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', ''); $breadcrumbNav->assign('breadcrumb', $breadcrumb, false); $breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=', false); @@ -188,7 +190,8 @@ if (isset($path)) { $folder->assign('usedSpacePercent', 0); $tmpl->assign('folder', $folder->fetchPage(), false); $tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true))); - $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=' . urlencode($getPath)); + $tmpl->assign('downloadURL', + OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=' . urlencode($getPath)); } else { $tmpl->assign('dir', $dir); diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 7776fd63b3..f9ff12679b 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -3,15 +3,20 @@
@@ -27,9 +32,12 @@
-

ownCloud – t('web services under your control'); ?>

+

ownCloud – +t('web services under your control'); ?>

From fb7de774741c939ffc03b083fe75bae0560b1c85 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Thu, 14 Feb 2013 22:46:28 +0100 Subject: [PATCH 057/103] Style cleanup files_trashbin --- apps/files_trashbin/lib/trash.php | 53 +++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 8d54a471b4..2b8b32c3a1 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -23,9 +23,11 @@ namespace OCA\Files_Trashbin; class Trashbin { - - const DEFAULT_RETENTION_OBLIGATION=180; // how long do we keep files in the trash bin if no other value is defined in the config file (unit: days) - const DEFAULTMAXSIZE=50; // unit: percentage; 50% of available disk space/quota + // how long do we keep files in the trash bin if no other value is defined in the config file (unit: days) + const DEFAULT_RETENTION_OBLIGATION=180; + + // unit: percentage; 50% of available disk space/quota + const DEFAULTMAXSIZE=50; /** * move file to the trash bin @@ -60,7 +62,8 @@ class Trashbin { $trashbinSize += self::copy_recursive($file_path, 'files_trashbin/'.$deleted.'.d'.$timestamp, $view); if ( $view->file_exists('files_trashbin/'.$deleted.'.d'.$timestamp) ) { - $query = \OC_DB::prepare("INSERT INTO *PREFIX*files_trash (id,timestamp,location,type,mime,user) VALUES (?,?,?,?,?,?)"); + $query = \OC_DB::prepare("INSERT INTO *PREFIX*files_trash (id,timestamp,location,type,mime,user)" + ." VALUES (?,?,?,?,?,?)"); $result = $query->execute(array($deleted, $timestamp, $location, $type, $mime, $user)); if ( !$result ) { // if file couldn't be added to the database than also don't store it in the trash bin. $view->deleteAll('files_trashbin/'.$deleted.'.d'.$timestamp); @@ -70,12 +73,15 @@ class Trashbin { if ( \OCP\App::isEnabled('files_versions') ) { if ( $view->is_dir('files_versions'.$file_path) ) { - $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_versions/'.$file_path)); + $trashbinSize += self::calculateSize( + new \OC_FilesystemView('/'. $user.'/files_versions/'.$file_path) + ); $view->rename('files_versions'.$file_path, 'versions_trashbin/'. $deleted.'.d'.$timestamp); } else if ( $versions = \OCA\Files_Versions\Storage::getVersions($file_path) ) { foreach ($versions as $v) { $trashbinSize += $view->filesize('files_versions'.$v['path'].'.v'.$v['version']); - $view->rename('files_versions'.$v['path'].'.v'.$v['version'], 'versions_trashbin/'. $deleted.'.v'.$v['version'].'.d'.$timestamp); + $view->rename('files_versions'.$v['path'].'.v'.$v['version'], + 'versions_trashbin/'. $deleted.'.v'.$v['version'].'.d'.$timestamp); } } } @@ -121,7 +127,8 @@ class Trashbin { $trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/versions_trashbin')); } if ( $timestamp ) { - $query = \OC_DB::prepare('SELECT location,type FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?'); + $query = \OC_DB::prepare('SELECT location,type FROM *PREFIX*files_trash' + .' WHERE user=? AND id=? AND timestamp=?'); $result = $query->execute(array($user,$filename,$timestamp))->fetchAll(); if ( count($result) != 1 ) { \OC_Log::write('files_trashbin', 'trash bin database inconsistent!', \OC_Log::ERROR); @@ -131,7 +138,7 @@ class Trashbin { // if location no longer exists, restore file in the root directory $location = $result[0]['location']; if ( $result[0]['location'] != '/' && - (!$view->is_dir('files'.$result[0]['location']) || + (!$view->is_dir('files'.$result[0]['location']) || !$view->isUpdatable('files'.$result[0]['location'])) ) { $location = ''; } @@ -165,16 +172,21 @@ class Trashbin { $versionedFile = $file; } if ( $result[0]['type'] == 'dir' ) { - $trashbinSize -= self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.'versions_trashbin/'. $file)); - $view->rename(\OC_Filesystem::normalizePath('versions_trashbin/'. $file), \OC_Filesystem::normalizePath('files_versions/'.$location.'/'.$filename.$ext)); + $trashbinSize -= self::calculateSize( + new \OC_FilesystemView('/'.$user.'/'.'versions_trashbin/'. $file) + ); + $view->rename(\OC_Filesystem::normalizePath('versions_trashbin/'. $file), + \OC_Filesystem::normalizePath('files_versions/'.$location.'/'.$filename.$ext)); } else if ( $versions = self::getVersionsFromTrash($versionedFile, $timestamp) ) { foreach ($versions as $v) { if ($timestamp ) { $trashbinSize -= $view->filesize('versions_trashbin/'.$versionedFile.'.v'.$v.'.d'.$timestamp); - $view->rename('versions_trashbin/'.$versionedFile.'.v'.$v.'.d'.$timestamp, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v); + $view->rename('versions_trashbin/'.$versionedFile.'.v'.$v.'.d'.$timestamp, + 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v); } else { $trashbinSize -= $view->filesize('versions_trashbin/'.$versionedFile.'.v'.$v); - $view->rename('versions_trashbin/'.$versionedFile.'.v'.$v, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v); + $view->rename('versions_trashbin/'.$versionedFile.'.v'.$v, + 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v); } } } @@ -280,7 +292,8 @@ class Trashbin { $query = \OC_DB::prepare('SELECT location,type,id,timestamp FROM *PREFIX*files_trash WHERE user=?'); $result = $query->execute(array($user))->fetchAll(); - $retention_obligation = \OC_Config::getValue('trashbin_retention_obligation', self::DEFAULT_RETENTION_OBLIGATION); + $retention_obligation = \OC_Config::getValue('trashbin_retention_obligation', + self::DEFAULT_RETENTION_OBLIGATION); $limit = time() - ($retention_obligation * 86400); @@ -289,13 +302,17 @@ class Trashbin { $filename = $r['id']; if ( $r['timestamp'] < $limit ) { if ($view->is_dir('files_trashbin/'.$filename.'.d'.$timestamp)) { - $size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/files_trashbin/'.$filename.'.d'.$timestamp)); + $size += self::calculateSize( + new \OC_FilesystemView('/'.$user.'/files_trashbin/'.$filename.'.d'.$timestamp) + ); } else { $size += $view->filesize('files_trashbin/'.$filename.'.d'.$timestamp); } $view->unlink('files_trashbin/'.$filename.'.d'.$timestamp); if ($r['type'] == 'dir') { - $size += self::calculateSize(new \OC_FilesystemView('/'.$user.'/versions_trashbin/'.$filename.'.d'.$timestamp)); + $size += self::calculateSize( + new \OC_FilesystemView('/'.$user.'/versions_trashbin/'.$filename.'.d'.$timestamp) + ); $view->unlink('versions_trashbin/'.$filename.'.d'.$timestamp); } else if ( $versions = self::getVersionsFromTrash($filename, $timestamp) ) { foreach ($versions as $v) { @@ -312,7 +329,8 @@ class Trashbin { $availableSpace = $availableSpace + $size; // if size limit for trash bin reached, delete oldest files in trash bin if ($availableSpace < 0) { - $query = \OC_DB::prepare('SELECT location,type,id,timestamp FROM *PREFIX*files_trash WHERE user=? ORDER BY timestamp ASC'); + $query = \OC_DB::prepare('SELECT location,type,id,timestamp FROM *PREFIX*files_trash' + .' WHERE user=? ORDER BY timestamp ASC'); $result = $query->execute(array($user))->fetchAll(); $length = count($result); $i = 0; @@ -418,7 +436,8 @@ class Trashbin { if (!file_exists($root)) { return 0; } - $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($root), \RecursiveIteratorIterator::CHILD_FIRST); + $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($root), + \RecursiveIteratorIterator::CHILD_FIRST); $size = 0; foreach ($iterator as $path) { From db8dbb9847da1a6f1146153414f8bd3bac4ca980 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Thu, 14 Feb 2013 22:53:30 +0100 Subject: [PATCH 058/103] Style cleanup files_versions --- apps/files_versions/lib/versions.php | 35 ++++++++++++---------- apps/files_versions/templates/history.php | 3 +- apps/files_versions/templates/settings.php | 5 +++- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index ba9f8ba41c..39c00001b4 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -20,19 +20,18 @@ class Storage { const DEFAULTENABLED=true; const DEFAULTMAXSIZE=50; // unit: percentage; 50% of available disk space/quota - private static $max_versions_per_interval = array( - 1 => array('intervalEndsAfter' => 10, //first 10sec, one version every 2sec - 'step' => 2), - 2 => array('intervalEndsAfter' => 60, //next minute, one version every 10sec - 'step' => 10), - 3 => array('intervalEndsAfter' => 3600, //next hour, one version every minute - 'step' => 60), - 4 => array('intervalEndsAfter' => 86400, //next 24h, one version every hour - 'step' => 3600), - 5 => array('intervalEndsAfter' => 2592000, //next 30days, one version per day - 'step' => 86400), - 6 => array('intervalEndsAfter' => -1, //until the end one version per week - 'step' => 604800), + private static $max_versions_per_interval = array( //first 10sec, one version every 2sec + 1 => array('intervalEndsAfter' => 10, 'step' => 2), + //next minute, one version every 10sec + 2 => array('intervalEndsAfter' => 60, 'step' => 10), + //next hour, one version every minute + 3 => array('intervalEndsAfter' => 3600, 'step' => 60), + //next 24h, one version every hour + 4 => array('intervalEndsAfter' => 86400, 'step' => 3600), + //next 30days, one version per day + 5 => array('intervalEndsAfter' => 2592000, 'step' => 86400), + //until the end one version per week + 6 => array('intervalEndsAfter' => -1, 'step' => 604800), ); private static function getUidAndFilename($filename) { @@ -238,7 +237,10 @@ class Storage { $versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions'); $versionsRoot = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath(''); - $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($versionsRoot), \RecursiveIteratorIterator::CHILD_FIRST); + $iterator = new \RecursiveIteratorIterator( + new \RecursiveDirectoryIterator($versionsRoot), + \RecursiveIteratorIterator::CHILD_FIRST + ); $size = 0; @@ -263,7 +265,10 @@ class Storage { $versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions'); $versionsRoot = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath(''); - $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($versionsRoot), \RecursiveIteratorIterator::CHILD_FIRST); + $iterator = new \RecursiveIteratorIterator( + new \RecursiveDirectoryIterator($versionsRoot), + \RecursiveIteratorIterator::CHILD_FIRST + ); $versions = array(); diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php index 850ece89c9..c450af66ad 100644 --- a/apps/files_versions/templates/history.php +++ b/apps/files_versions/templates/history.php @@ -22,7 +22,8 @@ if( isset( $_['message'] ) ) { foreach ( $_['versions'] as $v ) { echo ' '; echo OCP\Util::formatDate( doubleval($v['version']) ); - echo ' Revert

'; + echo ' Revert

'; if ( $v['cur'] ) { echo ' (Current)'; } diff --git a/apps/files_versions/templates/settings.php b/apps/files_versions/templates/settings.php index bfca8366f5..3b8e4baf11 100644 --- a/apps/files_versions/templates/settings.php +++ b/apps/files_versions/templates/settings.php @@ -1,6 +1,9 @@
t('Files Versioning');?> - />
+ />
From 1a747b3e480a2b44969b1306a5d354e721781c81 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Thu, 14 Feb 2013 23:19:12 +0100 Subject: [PATCH 059/103] Style cleanup core dir --- core/ajax/share.php | 62 +++++++++++++++++++++++++++------ core/js/config.php | 30 ++++++++++++++-- core/templates/exception.php | 4 ++- core/templates/installation.php | 53 +++++++++++++++++++--------- core/templates/layout.base.php | 3 +- core/templates/layout.guest.php | 6 ++-- core/templates/layout.user.php | 22 ++++++++---- core/templates/login.php | 3 +- core/templates/update.php | 3 +- 9 files changed, 143 insertions(+), 43 deletions(-) diff --git a/core/ajax/share.php b/core/ajax/share.php index 6704a00c5a..332b6a0bed 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -34,7 +34,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo $shareWith = null; } - $token = OCP\Share::shareItem($_POST['itemType'], $_POST['itemSource'], $shareType, $shareWith, $_POST['permissions']); + $token = OCP\Share::shareItem( + $_POST['itemType'], + $_POST['itemSource'], + $shareType, + $shareWith, + $_POST['permissions'] + ); if (is_string($token)) { OC_JSON::success(array('data' => array('token' => $token))); @@ -59,7 +65,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo break; case 'setPermissions': if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) { - $return = OCP\Share::setPermissions($_POST['itemType'], $_POST['itemSource'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']); + $return = OCP\Share::setPermissions( + $_POST['itemType'], + $_POST['itemSource'], + $_POST['shareType'], + $_POST['shareWith'], + $_POST['permissions'] + ); ($return) ? OC_JSON::success() : OC_JSON::error(); } break; @@ -86,9 +98,11 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo if ($type === 'dir') $subject = (string)$l->t('User %s shared a folder with you', $displayName); - $text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s', array($displayName, $file, $link)); + $text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s', + array($displayName, $file, $link)); if ($type === 'dir') - $text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($displayName, $file, $link)); + $text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', + array($displayName, $file, $link)); $default_from = OCP\Util::getDefaultEmailAddress('sharing-noreply'); @@ -112,14 +126,29 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo } break; case 'getItem': - if (isset($_GET['itemType']) && isset($_GET['itemSource']) && isset($_GET['checkReshare']) && isset($_GET['checkShares'])) { + if (isset($_GET['itemType']) + && isset($_GET['itemSource']) + && isset($_GET['checkReshare']) + && isset($_GET['checkShares'])) { if ($_GET['checkReshare'] == 'true') { - $reshare = OCP\Share::getItemSharedWithBySource($_GET['itemType'], $_GET['itemSource'], OCP\Share::FORMAT_NONE, null, true); + $reshare = OCP\Share::getItemSharedWithBySource( + $_GET['itemType'], + $_GET['itemSource'], + OCP\Share::FORMAT_NONE, + null, + true + ); } else { $reshare = false; } if ($_GET['checkShares'] == 'true') { - $shares = OCP\Share::getItemShared($_GET['itemType'], $_GET['itemSource'], OCP\Share::FORMAT_NONE, null, true); + $shares = OCP\Share::getItemShared( + $_GET['itemType'], + $_GET['itemSource'], + OCP\Share::FORMAT_NONE, + null, + true + ); } else { $shares = false; } @@ -165,8 +194,15 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo } $offset += $limit; foreach ($users as $uid => $displayName) { - if ((!isset($_GET['itemShares']) || !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_USER]) || !in_array($uid, $_GET['itemShares'][OCP\Share::SHARE_TYPE_USER])) && $uid != OC_User::getUser()) { - $shareWith[] = array('label' => $displayName, 'value' => array('shareType' => OCP\Share::SHARE_TYPE_USER, 'shareWith' => $uid)); + if ((!isset($_GET['itemShares']) + || !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_USER]) + || !in_array($uid, $_GET['itemShares'][OCP\Share::SHARE_TYPE_USER])) + && $uid != OC_User::getUser()) { + $shareWith[] = array( + 'label' => $displayName, + 'value' => array('shareType' => OCP\Share::SHARE_TYPE_USER, + 'shareWith' => $uid) + ); $count++; } } @@ -179,7 +215,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo || !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]) || !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]) || !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]))) { - $shareWith[] = array('label' => $group.' (group)', 'value' => array('shareType' => OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => $group)); + $shareWith[] = array( + 'label' => $group.' (group)', + 'value' => array( + 'shareType' => OCP\Share::SHARE_TYPE_GROUP, + 'shareWith' => $group + ) + ); $count++; } } else { diff --git a/core/js/config.php b/core/js/config.php index 9069175ed6..0aaa448228 100644 --- a/core/js/config.php +++ b/core/js/config.php @@ -29,8 +29,33 @@ $array = array( "oc_current_user" => "\"".OC_User::getUser(). "\"", "oc_requesttoken" => "\"".OC_Util::callRegister(). "\"", "datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')), - "dayNames" => json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))), - "monthNames" => json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))), + "dayNames" => json_encode( + array( + (string)$l->t('Sunday'), + (string)$l->t('Monday'), + (string)$l->t('Tuesday'), + (string)$l->t('Wednesday'), + (string)$l->t('Thursday'), + (string)$l->t('Friday'), + (string)$l->t('Saturday') + ) + ), + "monthNames" => json_encode( + array( + (string)$l->t('January'), + (string)$l->t('February'), + (string)$l->t('March'), + (string)$l->t('April'), + (string)$l->t('May'), + (string)$l->t('June'), + (string)$l->t('July'), + (string)$l->t('August'), + (string)$l->t('September'), + (string)$l->t('October'), + (string)$l->t('November'), + (string)$l->t('December') + ) + ), "firstDay" => json_encode($l->l('firstday', 'firstday')) , ); @@ -38,4 +63,3 @@ $array = array( foreach ($array as $setting => $value) { echo("var ". $setting ."=".$value.";\n"); } -?> \ No newline at end of file diff --git a/core/templates/exception.php b/core/templates/exception.php index 62d6cf2ade..4059c7e047 100644 --- a/core/templates/exception.php +++ b/core/templates/exception.php @@ -5,7 +5,9 @@

bug tracker, please copy the following informations into the description.