From 4eeb9c5b9944368611447530ef17007f9e4a9cce Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sat, 7 Jul 2012 11:30:48 -0400 Subject: Fix indentation and lower case the whole url inside handle() instead of calling for each parameter --- lib/ocs.php | 803 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 399 insertions(+), 404 deletions(-) (limited to 'lib') diff --git a/lib/ocs.php b/lib/ocs.php index 1be41202d78..25854e9ea33 100644 --- a/lib/ocs.php +++ b/lib/ocs.php @@ -29,429 +29,424 @@ */ class OC_OCS { - /** - * reads input date from get/post/cookies and converts the date to a special data-type - * - * @param variable $key - * @param variable-type $type - * @param priority $getpriority - * @param default $default - * @return data - */ - public static function readData($key,$type='raw',$getpriority=false,$default='') { - if($getpriority) { - if(isset($_GET[$key])) { - $data=$_GET[$key]; - } elseif(isset($_POST[$key])) { - $data=$_POST[$key]; - } else { - if($default=='') { - if(($type=='int') or ($type=='float')) $data=0; else $data=''; - } else { - $data=$default; - } - } - } else { - if(isset($_POST[$key])) { - $data=$_POST[$key]; - } elseif(isset($_GET[$key])) { - $data=$_GET[$key]; - } elseif(isset($_COOKIE[$key])) { - $data=$_COOKIE[$key]; - } else { - if($default=='') { - if(($type=='int') or ($type=='float')) $data=0; else $data=''; - } else { - $data=$default; - } - } - } - - if($type=='raw') return($data); - elseif($type=='text') return(addslashes(strip_tags($data))); - elseif($type=='int') { $data = (int) $data; return($data); } - elseif($type=='float') { $data = (float) $data; return($data); } - elseif($type=='array') { $data = $data; return($data); } - } + /** + * reads input date from get/post/cookies and converts the date to a special data-type + * + * @param variable $key + * @param variable-type $type + * @param priority $getpriority + * @param default $default + * @return data + */ + public static function readData($key,$type='raw',$getpriority=false,$default='') { + if($getpriority) { + if(isset($_GET[$key])) { + $data=$_GET[$key]; + } elseif(isset($_POST[$key])) { + $data=$_POST[$key]; + } else { + if($default=='') { + if(($type=='int') or ($type=='float')) $data=0; else $data=''; + } else { + $data=$default; + } + } + } else { + if(isset($_POST[$key])) { + $data=$_POST[$key]; + } elseif(isset($_GET[$key])) { + $data=$_GET[$key]; + } elseif(isset($_COOKIE[$key])) { + $data=$_COOKIE[$key]; + } else { + if($default=='') { + if(($type=='int') or ($type=='float')) $data=0; else $data=''; + } else { + $data=$default; + } + } + } + + if($type=='raw') return($data); + elseif($type=='text') return(addslashes(strip_tags($data))); + elseif($type=='int') { $data = (int) $data; return($data); } + elseif($type=='float') { $data = (float) $data; return($data); } + elseif($type=='array') { $data = $data; return($data); } + } /** main function to handle the REST request **/ - public static function handle() { - - // overwrite the 404 error page returncode - header("HTTP/1.0 200 OK"); - - - if($_SERVER['REQUEST_METHOD'] == 'GET') { - $method='get'; - }elseif($_SERVER['REQUEST_METHOD'] == 'PUT') { - $method='put'; - parse_str(file_get_contents("php://input"),$put_vars); - }elseif($_SERVER['REQUEST_METHOD'] == 'POST') { - $method='post'; - }else{ - echo('internal server error: method not supported'); - exit(); - } - - // preprocess url - $url=$_SERVER['REQUEST_URI']; - if(substr($url,(strlen($url)-1))<>'/') $url.='/'; - $ex=explode('/',$url); - $paracount=count($ex); - - // eventhandler - // CONFIG - // apiconfig - GET - CONFIG - if(($method=='get') and (strtolower($ex[$paracount-3])=='v1.php') and (strtolower($ex[$paracount-2])=='config')){ - $format=OC_OCS::readdata('format','text'); - OC_OCS::apiconfig($format); - - // PERSON - // personcheck - POST - PERSON/CHECK - }elseif(($method=='post') and (strtolower($ex[$paracount-4])=='v1.php') and (strtolower($ex[$paracount-3])=='person') and (strtolower($ex[$paracount-2])=='check')){ - $format=OC_OCS::readdata('format','text'); - $login=OC_OCS::readdata('login','text'); - $passwd=OC_OCS::readdata('password','text'); - OC_OCS::personcheck($format,$login,$passwd); - - // ACTIVITY - // activityget - GET ACTIVITY page,pagesize als urlparameter - }elseif(($method=='get') and (strtolower($ex[$paracount-3])=='v1.php')and (strtolower($ex[$paracount-2])=='activity')){ - $format=OC_OCS::readdata('format','text'); - $page=OC_OCS::readdata('page','int'); - $pagesize=OC_OCS::readdata('pagesize','int'); - if($pagesize<1 or $pagesize>100) $pagesize=10; - OC_OCS::activityget($format,$page,$pagesize); - - // activityput - POST ACTIVITY - }elseif(($method=='post') and (strtolower($ex[$paracount-3])=='v1.php')and (strtolower($ex[$paracount-2])=='activity')){ - $format=OC_OCS::readdata('format','text'); - $message=OC_OCS::readdata('message','text'); - OC_OCS::activityput($format,$message); - - // PRIVATEDATA - // get - GET DATA - }elseif(($method=='get') and (strtolower($ex[$paracount-4])=='v1.php')and (strtolower($ex[$paracount-2])=='getattribute')){ - $format=OC_OCS::readdata('format','text'); - OC_OCS::privateDataGet($format); - - }elseif(($method=='get') and (strtolower($ex[$paracount-5])=='v1.php')and (strtolower($ex[$paracount-3])=='getattribute')){ - $format=OC_OCS::readdata('format','text'); - $app=$ex[$paracount-2]; - OC_OCS::privateDataGet($format, $app); - }elseif(($method=='get') and (strtolower($ex[$paracount-6])=='v1.php')and (strtolower($ex[$paracount-4])=='getattribute')){ - $format=OC_OCS::readdata('format','text'); - $key=$ex[$paracount-2]; - $app=$ex[$paracount-3]; - OC_OCS::privateDataGet($format, $app,$key); - - // set - POST DATA - }elseif(($method=='post') and (strtolower($ex[$paracount-6])=='v1.php')and (strtolower($ex[$paracount-4])=='setattribute')){ - $format=OC_OCS::readdata('format','text'); - $key=$ex[$paracount-2]; - $app=$ex[$paracount-3]; - $value=OC_OCS::readdata('value','text'); - OC_OCS::privatedataset($format, $app, $key, $value); - // delete - POST DATA - }elseif(($method=='post') and (strtolower($ex[$paracount-6])=='v1.php')and (strtolower($ex[$paracount-4])=='deleteattribute')){ - $format=OC_OCS::readdata('format','text'); - $key=$ex[$paracount-2]; - $app=$ex[$paracount-3]; - OC_OCS::privatedatadelete($format, $app, $key); - - }else{ - $format=OC_OCS::readdata('format','text'); - $txt='Invalid query, please check the syntax. API specifications are here: http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n"; - $txt.=OC_OCS::getdebugoutput(); - echo(OC_OCS::generatexml($format,'failed',999,$txt)); - } - exit(); - } + public static function handle() { + // overwrite the 404 error page returncode + header("HTTP/1.0 200 OK"); + + + if($_SERVER['REQUEST_METHOD'] == 'GET') { + $method='get'; + }elseif($_SERVER['REQUEST_METHOD'] == 'PUT') { + $method='put'; + parse_str(file_get_contents("php://input"),$put_vars); + }elseif($_SERVER['REQUEST_METHOD'] == 'POST') { + $method='post'; + }else{ + echo('internal server error: method not supported'); + exit(); + } - /** - * generated some debug information to make it easier to find faild API calls - * @return debug data string - */ - private static function getDebugOutput() { - $txt=''; - $txt.="debug output:\n"; - if(isset($_SERVER['REQUEST_METHOD'])) $txt.='http request method: '.$_SERVER['REQUEST_METHOD']."\n"; - if(isset($_SERVER['REQUEST_URI'])) $txt.='http request uri: '.$_SERVER['REQUEST_URI']."\n"; - if(isset($_GET)) foreach($_GET as $key=>$value) $txt.='get parameter: '.$key.'->'.$value."\n"; - if(isset($_POST)) foreach($_POST as $key=>$value) $txt.='post parameter: '.$key.'->'.$value."\n"; - return($txt); - } + // preprocess url + $url = strtolower($_SERVER['REQUEST_URI']); + if(substr($url,(strlen($url)-1))<>'/') $url.='/'; + $ex=explode('/',$url); + $paracount=count($ex); + + // eventhandler + // CONFIG + // apiconfig - GET - CONFIG + if(($method=='get') and ($ex[$paracount-3] == 'v1.php') and ($ex[$paracount-2] == 'config')){ + $format=OC_OCS::readdata('format','text'); + OC_OCS::apiconfig($format); + + // PERSON + // personcheck - POST - PERSON/CHECK + }elseif(($method=='post') and ($ex[$paracount-4] == 'v1.php') and ($ex[$paracount-3]=='person') and ($ex[$paracount-2] == 'check')){ + $format=OC_OCS::readdata('format','text'); + $login=OC_OCS::readdata('login','text'); + $passwd=OC_OCS::readdata('password','text'); + OC_OCS::personcheck($format,$login,$passwd); + + // ACTIVITY + // activityget - GET ACTIVITY page,pagesize als urlparameter + }elseif(($method=='get') and ($ex[$paracount-3] == 'v1.php') and ($ex[$paracount-2] == 'activity')){ + $format=OC_OCS::readdata('format','text'); + $page=OC_OCS::readdata('page','int'); + $pagesize=OC_OCS::readdata('pagesize','int'); + if($pagesize<1 or $pagesize>100) $pagesize=10; + OC_OCS::activityget($format,$page,$pagesize); + + // activityput - POST ACTIVITY + }elseif(($method=='post') and ($ex[$paracount-3] == 'v1.php') and ($ex[$paracount-2] == 'activity')){ + $format=OC_OCS::readdata('format','text'); + $message=OC_OCS::readdata('message','text'); + OC_OCS::activityput($format,$message); + + // PRIVATEDATA + // get - GET DATA + }elseif(($method=='get') and ($ex[$paracount-4] == 'v1.php') and ($ex[$paracount-2] == 'getattribute')){ + $format=OC_OCS::readdata('format','text'); + OC_OCS::privateDataGet($format); + + }elseif(($method=='get') and ($ex[$paracount-5] == 'v1.php') and ($ex[$paracount-3] == 'getattribute')){ + $format=OC_OCS::readdata('format','text'); + $app=$ex[$paracount-2]; + OC_OCS::privateDataGet($format, $app); + }elseif(($method=='get') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-4] == 'getattribute')){ + $format=OC_OCS::readdata('format','text'); + $key=$ex[$paracount-2]; + $app=$ex[$paracount-3]; + OC_OCS::privateDataGet($format, $app,$key); + + // set - POST DATA + }elseif(($method=='post') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-4] == 'setattribute')){ + $format=OC_OCS::readdata('format','text'); + $key=$ex[$paracount-2]; + $app=$ex[$paracount-3]; + $value=OC_OCS::readdata('value','text'); + OC_OCS::privatedataset($format, $app, $key, $value); + // delete - POST DATA + }elseif(($method=='post') and ($ex[$paracount-6] =='v1.php') and ($ex[$paracount-4] == 'deleteattribute')){ + $format=OC_OCS::readdata('format','text'); + $key=$ex[$paracount-2]; + $app=$ex[$paracount-3]; + OC_OCS::privatedatadelete($format, $app, $key); - /** - * checks if the user is authenticated - * checks the IP whitlist, apikeys and login/password combination - * if $forceuser is true and the authentication failed it returns an 401 http response. - * if $forceuser is false and authentification fails it returns an empty username string - * @param bool $forceuser - * @return username string - */ - private static function checkPassword($forceuser=true) { - //valid user account ? - if(isset($_SERVER['PHP_AUTH_USER'])) $authuser=$_SERVER['PHP_AUTH_USER']; else $authuser=''; - if(isset($_SERVER['PHP_AUTH_PW'])) $authpw=$_SERVER['PHP_AUTH_PW']; else $authpw=''; - - if(empty($authuser)) { - if($forceuser){ - header('WWW-Authenticate: Basic realm="your valid user account or api key"'); - header('HTTP/1.0 401 Unauthorized'); - exit; - }else{ - $identifieduser=''; - } - }else{ - if(!OC_User::login($authuser,$authpw)){ - if($forceuser){ - header('WWW-Authenticate: Basic realm="your valid user account or api key"'); - header('HTTP/1.0 401 Unauthorized'); - exit; - }else{ - $identifieduser=''; - } - }else{ - $identifieduser=$authuser; - } - } - - return($identifieduser); - } + }else{ + $format=OC_OCS::readdata('format','text'); + $txt='Invalid query, please check the syntax. API specifications are here: http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n"; + $txt.=OC_OCS::getdebugoutput(); + echo(OC_OCS::generatexml($format,'failed',999,$txt)); + } + exit(); + } + /** + * generated some debug information to make it easier to find faild API calls + * @return debug data string + */ + private static function getDebugOutput() { + $txt=''; + $txt.="debug output:\n"; + if(isset($_SERVER['REQUEST_METHOD'])) $txt.='http request method: '.$_SERVER['REQUEST_METHOD']."\n"; + if(isset($_SERVER['REQUEST_URI'])) $txt.='http request uri: '.$_SERVER['REQUEST_URI']."\n"; + if(isset($_GET)) foreach($_GET as $key=>$value) $txt.='get parameter: '.$key.'->'.$value."\n"; + if(isset($_POST)) foreach($_POST as $key=>$value) $txt.='post parameter: '.$key.'->'.$value."\n"; + return($txt); + } - /** - * generates the xml or json response for the API call from an multidimenional data array. - * @param string $format - * @param string $status - * @param string $statuscode - * @param string $message - * @param array $data - * @param string $tag - * @param string $tagattribute - * @param int $dimension - * @param int $itemscount - * @param int $itemsperpage - * @return string xml/json - */ - private static function generateXml($format,$status,$statuscode,$message,$data=array(),$tag='',$tagattribute='',$dimension=-1,$itemscount='',$itemsperpage='') { - if($format=='json') { - - $json=array(); - $json['status']=$status; - $json['statuscode']=$statuscode; - $json['message']=$message; - $json['totalitems']=$itemscount; - $json['itemsperpage']=$itemsperpage; - $json['data']=$data; - return(json_encode($json)); - - - }else{ - $txt=''; - $writer = xmlwriter_open_memory(); - xmlwriter_set_indent( $writer, 2 ); - xmlwriter_start_document($writer ); - xmlwriter_start_element($writer,'ocs'); - xmlwriter_start_element($writer,'meta'); - xmlwriter_write_element($writer,'status',$status); - xmlwriter_write_element($writer,'statuscode',$statuscode); - xmlwriter_write_element($writer,'message',$message); - if($itemscount<>'') xmlwriter_write_element($writer,'totalitems',$itemscount); - if(!empty($itemsperpage)) xmlwriter_write_element($writer,'itemsperpage',$itemsperpage); - xmlwriter_end_element($writer); - if($dimension=='0') { - // 0 dimensions - xmlwriter_write_element($writer,'data',$data); - - }elseif($dimension=='1') { - xmlwriter_start_element($writer,'data'); - foreach($data as $key=>$entry) { - xmlwriter_write_element($writer,$key,$entry); - } - xmlwriter_end_element($writer); - - }elseif($dimension=='2') { - xmlwriter_start_element($writer,'data'); - foreach($data as $entry) { - xmlwriter_start_element($writer,$tag); - if(!empty($tagattribute)) { - xmlwriter_write_attribute($writer,'details',$tagattribute); - } - foreach($entry as $key=>$value) { - if(is_array($value)){ - foreach($value as $k=>$v) { - xmlwriter_write_element($writer,$k,$v); - } - } else { - xmlwriter_write_element($writer,$key,$value); - } - } - xmlwriter_end_element($writer); - } - xmlwriter_end_element($writer); - - }elseif($dimension=='3') { - xmlwriter_start_element($writer,'data'); - foreach($data as $entrykey=>$entry) { - xmlwriter_start_element($writer,$tag); - if(!empty($tagattribute)) { - xmlwriter_write_attribute($writer,'details',$tagattribute); - } - foreach($entry as $key=>$value) { - if(is_array($value)){ - xmlwriter_start_element($writer,$entrykey); - foreach($value as $k=>$v) { - xmlwriter_write_element($writer,$k,$v); - } - xmlwriter_end_element($writer); - } else { - xmlwriter_write_element($writer,$key,$value); - } - } - xmlwriter_end_element($writer); - } - xmlwriter_end_element($writer); - }elseif($dimension=='dynamic') { - xmlwriter_start_element($writer,'data'); - OC_OCS::toxml($writer,$data,'comment'); - xmlwriter_end_element($writer); - } - - xmlwriter_end_element($writer); - - xmlwriter_end_document( $writer ); - $txt.=xmlwriter_output_memory( $writer ); - unset($writer); - return($txt); - } - } - - public static function toXml($writer,$data,$node) { - foreach($data as $key => $value) { - if (is_numeric($key)) { - $key = $node; - } - if (is_array($value)){ - xmlwriter_start_element($writer,$key); - OC_OCS::toxml($writer,$value,$node); - xmlwriter_end_element($writer); - }else{ - xmlwriter_write_element($writer,$key,$value); - } - - } - } + /** + * checks if the user is authenticated + * checks the IP whitlist, apikeys and login/password combination + * if $forceuser is true and the authentication failed it returns an 401 http response. + * if $forceuser is false and authentification fails it returns an empty username string + * @param bool $forceuser + * @return username string + */ + private static function checkPassword($forceuser=true) { + //valid user account ? + if(isset($_SERVER['PHP_AUTH_USER'])) $authuser=$_SERVER['PHP_AUTH_USER']; else $authuser=''; + if(isset($_SERVER['PHP_AUTH_PW'])) $authpw=$_SERVER['PHP_AUTH_PW']; else $authpw=''; + + if(empty($authuser)) { + if($forceuser){ + header('WWW-Authenticate: Basic realm="your valid user account or api key"'); + header('HTTP/1.0 401 Unauthorized'); + exit; + }else{ + $identifieduser=''; + } + }else{ + if(!OC_User::login($authuser,$authpw)){ + if($forceuser){ + header('WWW-Authenticate: Basic realm="your valid user account or api key"'); + header('HTTP/1.0 401 Unauthorized'); + exit; + }else{ + $identifieduser=''; + } + }else{ + $identifieduser=$authuser; + } + } + return($identifieduser); + } + /** + * generates the xml or json response for the API call from an multidimenional data array. + * @param string $format + * @param string $status + * @param string $statuscode + * @param string $message + * @param array $data + * @param string $tag + * @param string $tagattribute + * @param int $dimension + * @param int $itemscount + * @param int $itemsperpage + * @return string xml/json + */ + private static function generateXml($format,$status,$statuscode,$message,$data=array(),$tag='',$tagattribute='',$dimension=-1,$itemscount='',$itemsperpage='') { + if($format=='json') { + $json=array(); + $json['status']=$status; + $json['statuscode']=$statuscode; + $json['message']=$message; + $json['totalitems']=$itemscount; + $json['itemsperpage']=$itemsperpage; + $json['data']=$data; + return(json_encode($json)); + }else{ + $txt=''; + $writer = xmlwriter_open_memory(); + xmlwriter_set_indent( $writer, 2 ); + xmlwriter_start_document($writer ); + xmlwriter_start_element($writer,'ocs'); + xmlwriter_start_element($writer,'meta'); + xmlwriter_write_element($writer,'status',$status); + xmlwriter_write_element($writer,'statuscode',$statuscode); + xmlwriter_write_element($writer,'message',$message); + if($itemscount<>'') xmlwriter_write_element($writer,'totalitems',$itemscount); + if(!empty($itemsperpage)) xmlwriter_write_element($writer,'itemsperpage',$itemsperpage); + xmlwriter_end_element($writer); + if($dimension=='0') { + // 0 dimensions + xmlwriter_write_element($writer,'data',$data); + + }elseif($dimension=='1') { + xmlwriter_start_element($writer,'data'); + foreach($data as $key=>$entry) { + xmlwriter_write_element($writer,$key,$entry); + } + xmlwriter_end_element($writer); + + }elseif($dimension=='2') { + xmlwriter_start_element($writer,'data'); + foreach($data as $entry) { + xmlwriter_start_element($writer,$tag); + if(!empty($tagattribute)) { + xmlwriter_write_attribute($writer,'details',$tagattribute); + } + foreach($entry as $key=>$value) { + if(is_array($value)){ + foreach($value as $k=>$v) { + xmlwriter_write_element($writer,$k,$v); + } + } else { + xmlwriter_write_element($writer,$key,$value); + } + } + xmlwriter_end_element($writer); + } + xmlwriter_end_element($writer); + + }elseif($dimension=='3') { + xmlwriter_start_element($writer,'data'); + foreach($data as $entrykey=>$entry) { + xmlwriter_start_element($writer,$tag); + if(!empty($tagattribute)) { + xmlwriter_write_attribute($writer,'details',$tagattribute); + } + foreach($entry as $key=>$value) { + if(is_array($value)){ + xmlwriter_start_element($writer,$entrykey); + foreach($value as $k=>$v) { + xmlwriter_write_element($writer,$k,$v); + } + xmlwriter_end_element($writer); + } else { + xmlwriter_write_element($writer,$key,$value); + } + } + xmlwriter_end_element($writer); + } + xmlwriter_end_element($writer); + }elseif($dimension=='dynamic') { + xmlwriter_start_element($writer,'data'); + OC_OCS::toxml($writer,$data,'comment'); + xmlwriter_end_element($writer); + } - /** - * return the config data of this server - * @param string $format - * @return string xml/json - */ - private static function apiConfig($format) { - $user=OC_OCS::checkpassword(false); - $url=substr(OCP\Util::getServerHost().$_SERVER['SCRIPT_NAME'],0,-11).''; - - $xml['version']='1.5'; - $xml['website']='ownCloud'; - $xml['host']=OCP\Util::getServerHost(); - $xml['contact']=''; - $xml['ssl']='false'; - echo(OC_OCS::generatexml($format,'ok',100,'',$xml,'config','',1)); - } + xmlwriter_end_element($writer); + xmlwriter_end_document( $writer ); + $txt.=xmlwriter_output_memory( $writer ); + unset($writer); + return($txt); + } + } - /** - * check if the provided login/apikey/password is valid - * @param string $format - * @param string $login - * @param string $passwd - * @return string xml/json - */ - private static function personCheck($format,$login,$passwd) { - if($login<>''){ - if(OC_User::login($login,$passwd)){ - $xml['person']['personid']=$login; - echo(OC_OCS::generatexml($format,'ok',100,'',$xml,'person','check',2)); - }else{ - echo(OC_OCS::generatexml($format,'failed',102,'login not valid')); - } - }else{ - echo(OC_OCS::generatexml($format,'failed',101,'please specify all mandatory fields')); - } - } - - - - // ACTIVITY API ############################################# + public static function toXml($writer,$data,$node) { + foreach($data as $key => $value) { + if (is_numeric($key)) { + $key = $node; + } + if (is_array($value)){ + xmlwriter_start_element($writer,$key); + OC_OCS::toxml($writer,$value,$node); + xmlwriter_end_element($writer); + }else{ + xmlwriter_write_element($writer,$key,$value); + } + } + } - /** - * get my activities - * @param string $format - * @param string $page - * @param string $pagesize - * @return string xml/json - */ - private static function activityGet($format,$page,$pagesize) { - $user=OC_OCS::checkpassword(); - - //TODO - - $txt=OC_OCS::generatexml($format,'ok',100,'',$xml,'activity','full',2,$totalcount,$pagesize); - echo($txt); - } - /** - * submit a activity - * @param string $format - * @param string $message - * @return string xml/json - */ - private static function activityPut($format,$message) { - // not implemented in ownCloud - $user=OC_OCS::checkpassword(); - echo(OC_OCS::generatexml($format,'ok',100,'')); - } - - // PRIVATEDATA API ############################################# - /** - * get private data and create the xml for ocs - * @param string $format - * @param string $app - * @param string $key - * @return string xml/json - */ - private static function privateDataGet($format,$app="",$key="") { - $user=OC_OCS::checkpassword(); - $result=OC_OCS::getData($user,$app,$key); - $xml=array(); - foreach($result as $i=>$log) { - $xml[$i]['key']=$log['key']; - $xml[$i]['app']=$log['app']; - $xml[$i]['value']=$log['value']; - } - - - $txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'privatedata', 'full', 2, count($xml), 0);//TODO: replace 'privatedata' with 'attribute' once a new libattice has been released that works with it - echo($txt); - } - /** - * set private data referenced by $key to $value and generate the xml for ocs - * @param string $format - * @param string $app - * @param string $key - * @param string $value - * @return string xml/json - */ + /** + * return the config data of this server + * @param string $format + * @return string xml/json + */ + private static function apiConfig($format) { + $user=OC_OCS::checkpassword(false); + $url=substr(OCP\Util::getServerHost().$_SERVER['SCRIPT_NAME'],0,-11).''; + + $xml['version']='1.5'; + $xml['website']='ownCloud'; + $xml['host']=OCP\Util::getServerHost(); + $xml['contact']=''; + $xml['ssl']='false'; + echo(OC_OCS::generatexml($format,'ok',100,'',$xml,'config','',1)); + } + + + /** + * check if the provided login/apikey/password is valid + * @param string $format + * @param string $login + * @param string $passwd + * @return string xml/json + */ + private static function personCheck($format,$login,$passwd) { + if($login<>''){ + if(OC_User::login($login,$passwd)){ + $xml['person']['personid']=$login; + echo(OC_OCS::generatexml($format,'ok',100,'',$xml,'person','check',2)); + }else{ + echo(OC_OCS::generatexml($format,'failed',102,'login not valid')); + } + }else{ + echo(OC_OCS::generatexml($format,'failed',101,'please specify all mandatory fields')); + } + } + + + + // ACTIVITY API ############################################# + + /** + * get my activities + * @param string $format + * @param string $page + * @param string $pagesize + * @return string xml/json + */ + private static function activityGet($format,$page,$pagesize) { + $user=OC_OCS::checkpassword(); + + //TODO + + $txt=OC_OCS::generatexml($format,'ok',100,'',$xml,'activity','full',2,$totalcount,$pagesize); + echo($txt); + } + + /** + * submit a activity + * @param string $format + * @param string $message + * @return string xml/json + */ + private static function activityPut($format,$message) { + // not implemented in ownCloud + $user=OC_OCS::checkpassword(); + echo(OC_OCS::generatexml($format,'ok',100,'')); + } + + // PRIVATEDATA API ############################################# + + /** + * get private data and create the xml for ocs + * @param string $format + * @param string $app + * @param string $key + * @return string xml/json + */ + private static function privateDataGet($format,$app="",$key="") { + $user=OC_OCS::checkpassword(); + $result=OC_OCS::getData($user,$app,$key); + $xml=array(); + foreach($result as $i=>$log) { + $xml[$i]['key']=$log['key']; + $xml[$i]['app']=$log['app']; + $xml[$i]['value']=$log['value']; + } + + + $txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'privatedata', 'full', 2, count($xml), 0);//TODO: replace 'privatedata' with 'attribute' once a new libattice has been released that works with it + echo($txt); + } + + /** + * set private data referenced by $key to $value and generate the xml for ocs + * @param string $format + * @param string $app + * @param string $key + * @param string $value + * @return string xml/json + */ private static function privateDataSet($format, $app, $key, $value) { $user=OC_OCS::checkpassword(); if(OC_OCS::setData($user,$app,$key,$value)){ -- cgit v1.2.3 From e8657c51ba8499fe0f0f46eaa1a8503bff2d2b2a Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sat, 7 Jul 2012 14:51:06 -0400 Subject: Implement PERSON add --- lib/ocs.php | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/ocs.php b/lib/ocs.php index 25854e9ea33..309e3bb0647 100644 --- a/lib/ocs.php +++ b/lib/ocs.php @@ -75,9 +75,9 @@ class OC_OCS { } - /** - main function to handle the REST request - **/ + /** + main function to handle the REST request + **/ public static function handle() { // overwrite the 404 error page returncode header("HTTP/1.0 200 OK"); @@ -115,7 +115,20 @@ class OC_OCS { $login=OC_OCS::readdata('login','text'); $passwd=OC_OCS::readdata('password','text'); OC_OCS::personcheck($format,$login,$passwd); - + } else if ($method == 'post' && $ex[$paracount - 4] == 'v1.php' && $ex[$paracount - 3] == 'person' && $ex[$paracount - 2] == 'add') { + $format = self::readData('format', 'text'); + if (OC_Group::inGroup(self::checkPassword(), 'admin')) { + $login = self::readData('login', 'text'); + $password = self::readData('password', 'text'); + try { + OC_User::createUser($login, $password); + echo self::generateXml($format, 'ok', 201, ''); + } catch (Exception $exception) { + echo self::generateXml($format, 'fail', 400, $exception->getMessage()); + } + } else { + echo self::generateXml($format, 'fail', 403, 'Permission denied'); + } // ACTIVITY // activityget - GET ACTIVITY page,pagesize als urlparameter }elseif(($method=='get') and ($ex[$paracount-3] == 'v1.php') and ($ex[$paracount-2] == 'activity')){ -- cgit v1.2.3 From 7de97ed20003d1f5ab9e2bfde9386bba07d0eff8 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sat, 7 Jul 2012 16:54:07 -0400 Subject: Make readData() exit with a 400 Bad Request for not provided required parameters, and sanitize text --- lib/ocs.php | 95 ++++++++++++++++++++++++++----------------------------------- 1 file changed, 41 insertions(+), 54 deletions(-) (limited to 'lib') diff --git a/lib/ocs.php b/lib/ocs.php index 309e3bb0647..5e697b48304 100644 --- a/lib/ocs.php +++ b/lib/ocs.php @@ -4,7 +4,9 @@ * ownCloud * * @author Frank Karlitschek +* @author Michael Gapczynski * @copyright 2012 Frank Karlitschek frank@owncloud.org +* @copyright 2012 Michael Gapczynski mtgap@owncloud.com * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -32,49 +34,44 @@ class OC_OCS { /** * reads input date from get/post/cookies and converts the date to a special data-type * - * @param variable $key - * @param variable-type $type - * @param priority $getpriority - * @param default $default - * @return data + * @param string HTTP method to read the key from + * @param string Parameter to read + * @param string Variable type to format data + * @param mixed Default value to return if the key is not found + * @return mixed Data or if the key is not found and no default is set it will exit with a 400 Bad request */ - public static function readData($key,$type='raw',$getpriority=false,$default='') { - if($getpriority) { - if(isset($_GET[$key])) { - $data=$_GET[$key]; - } elseif(isset($_POST[$key])) { - $data=$_POST[$key]; - } else { - if($default=='') { - if(($type=='int') or ($type=='float')) $data=0; else $data=''; + public static function readData($method, $key, $type = 'raw', $default = null) { + if ($method == 'get') { + if (isset($_GET[$key])) { + $data = $_GET[$key]; + } else if (isset($default)) { + return $default; } else { - $data=$default; + $data = false; } - } - } else { - if(isset($_POST[$key])) { - $data=$_POST[$key]; - } elseif(isset($_GET[$key])) { - $data=$_GET[$key]; - } elseif(isset($_COOKIE[$key])) { - $data=$_COOKIE[$key]; - } else { - if($default=='') { - if(($type=='int') or ($type=='float')) $data=0; else $data=''; + } else if ($method == 'post') { + if (isset($_POST[$key])) { + $data = $_POST[$key]; + } else if (isset($default)) { + return $default; } else { - $data=$default; + $data = false; } } + if ($data === false) { + echo self::generateXml('', 'fail', 400, 'Bad request. Please provide a valid '.$key); + exit(); + } else { + // NOTE: Is the raw type necessary? It might be a little risky without sanitization + if ($type == 'raw') return $data; + elseif ($type == 'text') return OC_Util::sanitizeHTML($data); + elseif ($type == 'int') return (int) $data; + elseif ($type == 'float') return (float) $data; + elseif ($type == 'array') return OC_Util::sanitizeHTML($data); + else return OC_Util::sanitizeHTML($data); } - - if($type=='raw') return($data); - elseif($type=='text') return(addslashes(strip_tags($data))); - elseif($type=='int') { $data = (int) $data; return($data); } - elseif($type=='float') { $data = (float) $data; return($data); } - elseif($type=='array') { $data = $data; return($data); } } - /** main function to handle the REST request **/ @@ -100,26 +97,23 @@ class OC_OCS { if(substr($url,(strlen($url)-1))<>'/') $url.='/'; $ex=explode('/',$url); $paracount=count($ex); - + $format = self::readData($method, 'format', 'text', ''); // eventhandler // CONFIG // apiconfig - GET - CONFIG if(($method=='get') and ($ex[$paracount-3] == 'v1.php') and ($ex[$paracount-2] == 'config')){ - $format=OC_OCS::readdata('format','text'); OC_OCS::apiconfig($format); // PERSON // personcheck - POST - PERSON/CHECK }elseif(($method=='post') and ($ex[$paracount-4] == 'v1.php') and ($ex[$paracount-3]=='person') and ($ex[$paracount-2] == 'check')){ - $format=OC_OCS::readdata('format','text'); - $login=OC_OCS::readdata('login','text'); - $passwd=OC_OCS::readdata('password','text'); + $login = self::readData($method, 'login', 'text'); + $passwd = self::readData($method, 'password', 'text'); OC_OCS::personcheck($format,$login,$passwd); } else if ($method == 'post' && $ex[$paracount - 4] == 'v1.php' && $ex[$paracount - 3] == 'person' && $ex[$paracount - 2] == 'add') { - $format = self::readData('format', 'text'); if (OC_Group::inGroup(self::checkPassword(), 'admin')) { - $login = self::readData('login', 'text'); - $password = self::readData('password', 'text'); + $login = self::readData($method, 'login', 'text'); + $password = self::readData($method, 'password', 'text'); try { OC_User::createUser($login, $password); echo self::generateXml($format, 'ok', 201, ''); @@ -132,50 +126,43 @@ class OC_OCS { // ACTIVITY // activityget - GET ACTIVITY page,pagesize als urlparameter }elseif(($method=='get') and ($ex[$paracount-3] == 'v1.php') and ($ex[$paracount-2] == 'activity')){ - $format=OC_OCS::readdata('format','text'); - $page=OC_OCS::readdata('page','int'); - $pagesize=OC_OCS::readdata('pagesize','int'); + $page = self::readData($method, 'page', 'int', 0); + $pagesize = self::readData($method, 'pagesize','int', 10); if($pagesize<1 or $pagesize>100) $pagesize=10; OC_OCS::activityget($format,$page,$pagesize); // activityput - POST ACTIVITY }elseif(($method=='post') and ($ex[$paracount-3] == 'v1.php') and ($ex[$paracount-2] == 'activity')){ - $format=OC_OCS::readdata('format','text'); - $message=OC_OCS::readdata('message','text'); + $message = self::readData($method, 'message', 'text'); OC_OCS::activityput($format,$message); // PRIVATEDATA // get - GET DATA }elseif(($method=='get') and ($ex[$paracount-4] == 'v1.php') and ($ex[$paracount-2] == 'getattribute')){ - $format=OC_OCS::readdata('format','text'); OC_OCS::privateDataGet($format); }elseif(($method=='get') and ($ex[$paracount-5] == 'v1.php') and ($ex[$paracount-3] == 'getattribute')){ - $format=OC_OCS::readdata('format','text'); $app=$ex[$paracount-2]; OC_OCS::privateDataGet($format, $app); }elseif(($method=='get') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-4] == 'getattribute')){ - $format=OC_OCS::readdata('format','text'); + $key=$ex[$paracount-2]; $app=$ex[$paracount-3]; OC_OCS::privateDataGet($format, $app,$key); // set - POST DATA }elseif(($method=='post') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-4] == 'setattribute')){ - $format=OC_OCS::readdata('format','text'); $key=$ex[$paracount-2]; $app=$ex[$paracount-3]; - $value=OC_OCS::readdata('value','text'); + $value = self::readData($method, 'value', 'text'); OC_OCS::privatedataset($format, $app, $key, $value); // delete - POST DATA }elseif(($method=='post') and ($ex[$paracount-6] =='v1.php') and ($ex[$paracount-4] == 'deleteattribute')){ - $format=OC_OCS::readdata('format','text'); $key=$ex[$paracount-2]; $app=$ex[$paracount-3]; OC_OCS::privatedatadelete($format, $app, $key); }else{ - $format=OC_OCS::readdata('format','text'); $txt='Invalid query, please check the syntax. API specifications are here: http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n"; $txt.=OC_OCS::getdebugoutput(); echo(OC_OCS::generatexml($format,'failed',999,$txt)); -- cgit v1.2.3 From 20838bb9c2f77bf45cf7e4bccf9f941cbc39bbdb Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Sat, 28 Jul 2012 21:40:11 +0000 Subject: Basic structure and functionality of api class --- lib/api.php | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 lib/api.php (limited to 'lib') diff --git a/lib/api.php b/lib/api.php new file mode 100644 index 00000000000..767f1d30b7d --- /dev/null +++ b/lib/api.php @@ -0,0 +1,91 @@ +. + * + */ + + class OC_API { + + /** + * api actions + */ + protected $actions = array(); + + /** + * registers an api call + * @param string $method the http method + * @param string $url the url to match + * @param callable $action the function to run + */ + public function register($method, $url, $action){ + $name = strtolower($method).$url; + if(!isset(self::$actions[$name])){ + OC_Router::create($name, $url) + ->action('OC_API', 'call'); + self::$actions[$name] = array(); + } + self::$actions[$name][] = $action; + } + + /** + * handles an api call + * @param array $parameters + */ + public function call($parameters){ + // TODO load the routes.php from apps + $name = $parameters['_name']; + $response = array(); + // Loop through registered actions + foreach(self::$actions[$name] as $action){ + if(is_callable($action)){ + $action_response = call_user_func($action, $parameters); + if(is_array($action_response)){ + // Merge with previous + $response = array_merge($response, $action_response); + } else { + // TODO - Something failed, do we return an error code, depends on other action responses + } + } else { + // Action not callable + // log + // TODO - Depending on other action responses, do we return a 501? + } + } + // Send the response + if(isset($parameters['_format'])){ + self::respond($response, $parameters['_format']); + } else { + self::respond($response); + } + } + + /** + * respond to a call + * @param int|array $response the response + * @param string $format the format xml|json + */ + private function respond($response, $format='json'){ + // TODO respond in the correct format + } + + } \ No newline at end of file -- cgit v1.2.3 From c375774fca619ee4bd886a9c675908c4006cc980 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Sat, 28 Jul 2012 21:50:40 +0000 Subject: Fix odd indentation issue --- lib/api.php | 178 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 89 insertions(+), 89 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index 767f1d30b7d..eaa2bb42f8c 100644 --- a/lib/api.php +++ b/lib/api.php @@ -1,91 +1,91 @@ . - * - */ - - class OC_API { - - /** - * api actions - */ - protected $actions = array(); - - /** - * registers an api call - * @param string $method the http method - * @param string $url the url to match - * @param callable $action the function to run - */ - public function register($method, $url, $action){ - $name = strtolower($method).$url; - if(!isset(self::$actions[$name])){ - OC_Router::create($name, $url) - ->action('OC_API', 'call'); - self::$actions[$name] = array(); - } - self::$actions[$name][] = $action; - } - - /** - * handles an api call - * @param array $parameters - */ - public function call($parameters){ - // TODO load the routes.php from apps - $name = $parameters['_name']; - $response = array(); - // Loop through registered actions - foreach(self::$actions[$name] as $action){ - if(is_callable($action)){ - $action_response = call_user_func($action, $parameters); - if(is_array($action_response)){ - // Merge with previous - $response = array_merge($response, $action_response); - } else { - // TODO - Something failed, do we return an error code, depends on other action responses - } - } else { - // Action not callable - // log - // TODO - Depending on other action responses, do we return a 501? - } - } - // Send the response - if(isset($parameters['_format'])){ - self::respond($response, $parameters['_format']); - } else { - self::respond($response); - } - } - - /** - * respond to a call - * @param int|array $response the response - * @param string $format the format xml|json - */ - private function respond($response, $format='json'){ - // TODO respond in the correct format - } - - } \ No newline at end of file +* ownCloud +* +* @author Tom Needham +* @author Michael Gapczynski +* @author Bart Visscher +* @copyright 2012 Tom Needham tom@owncloud.com +* @copyright 2012 Michael Gapczynski mtgap@owncloud.com +* @copyright 2012 Bart Visscher bartv@thisnet.nl +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE +* License as published by the Free Software Foundation; either +* version 3 of the License, or any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU AFFERO GENERAL PUBLIC LICENSE for more details. +* +* You should have received a copy of the GNU Affero General Public +* License along with this library. If not, see . +* +*/ + +class OC_API { + + /** + * api actions + */ + protected $actions = array(); + + /** + * registers an api call + * @param string $method the http method + * @param string $url the url to match + * @param callable $action the function to run + */ + public function register($method, $url, $action){ + $name = strtolower($method).$url; + if(!isset(self::$actions[$name])){ + OC_Router::create($name, $url) + ->action('OC_API', 'call'); + self::$actions[$name] = array(); + } + self::$actions[$name][] = $action; + } + + /** + * handles an api call + * @param array $parameters + */ + public function call($parameters){ + + $name = $parameters['_name']; + $response = array(); + // Loop through registered actions + foreach(self::$actions[$name] as $action){ + if(is_callable($action)){ + $action_response = call_user_func($action, $parameters); + if(is_array($action_response)){ + // Merge with previous + $response = array_merge($response, $action_response); + } else { + // TODO - Something failed, do we return an error code, depends on other action responses + } + } else { + // Action not callable + // log + // TODO - Depending on other action responses, do we return a 501? + } + } + // Send the response + if(isset($parameters['_format'])){ + self::respond($response, $parameters['_format']); + } else { + self::respond($response); + } + } + + /** + * respond to a call + * @param int|array $response the response + * @param string $format the format xml|json + */ + private function respond($response, $format='json'){ + // TODO respond in the correct format + } + + } \ No newline at end of file -- cgit v1.2.3 From 9dbe5f3703afd84c701d0d1347c06f1b07ff7fe6 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Sat, 28 Jul 2012 21:57:24 +0000 Subject: Load routes before calling actions --- lib/api.php | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index eaa2bb42f8c..cf40167b07a 100644 --- a/lib/api.php +++ b/lib/api.php @@ -53,6 +53,15 @@ class OC_API { */ public function call($parameters){ + // Get the routes + // TODO cache + foreach(OC_APP::getEnabledApps() as $app){ + $file = OC_App::getAppPath($app).'/appinfo/routes.php'; + if(file_exists($file)){ + require_once($file); + } + } + $name = $parameters['_name']; $response = array(); // Loop through registered actions -- cgit v1.2.3 From 038af7e636ad8a2dc9ac342eaecd176cc5c35256 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Sun, 29 Jul 2012 15:29:26 +0000 Subject: Add method to check if an app is shipped or not --- lib/app.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) mode change 100755 => 100644 lib/app.php (limited to 'lib') diff --git a/lib/app.php b/lib/app.php old mode 100755 new mode 100644 index 56132c08671..60bd0ef476b --- a/lib/app.php +++ b/lib/app.php @@ -139,6 +139,20 @@ class OC_App{ OC_Appconfig::setValue($app,'types',$appTypes); } + + /** + * check if app is shipped + * @param string $appid the id of the app to check + * @return bool + */ + public function isShipped($appid){ + $info = self::getAppInfo($appid); + if(isset($info['shipped']) && $info['shipped']=='true'){ + return true; + } else { + return false; + } + } /** * get all enabled apps -- cgit v1.2.3 From e33174f115d7459afb15131f0bc4a6386a673608 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Mon, 30 Jul 2012 10:56:21 +0000 Subject: Add core routes and include them in OC_API::call() --- core/routes.php | 25 +++++++++++++++++++++++++ lib/api.php | 8 +++++--- 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 core/routes.php (limited to 'lib') diff --git a/core/routes.php b/core/routes.php new file mode 100644 index 00000000000..4c5004dcf5a --- /dev/null +++ b/core/routes.php @@ -0,0 +1,25 @@ + + * This file is licensed under the Affero General Public License version 3 or later. + * See the COPYING-README file. + */ + +// Config +OC_API::register('get', '/config.{format}', array('OC_API_Config', 'apiConfig')); +// Person +OC_API::register('post', '/person/check.{format}', array('OC_API_Person', 'check')); +// Activity +OC_API::register('get', '/activity.{format}', array('OC_API_Activity', 'activityGet')); +OC_API::register('post', '/activity.{format}', array('OC_API_Activity', 'activityPut')); +// Privatedata +OC_API::register('get', '/privatedata/getattribute/{app}/{key}.{format}', array('OC_API_Privatedata', 'privatedataGet')); +OC_API::register('post', '/privatedata/setattribute/{app}/{key}.{format}', array('OC_API_Privatedata', 'privatedataPut')); +OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}.{format}', array('OC_API_Privatedata', 'privatedataDelete')); +// Cloud +OC_API::register('get', '/cloud/system/webapps.{format}', array('OC_API_Cloud', 'systemwebapps')); +OC_API::register('get', '/cloud/user/{user}.{format}', array('OC_API_Cloud', 'getQuota')); +OC_API::register('post', '/cloud/user/{user}.{format}', array('OC_API_Cloud', 'setQuota')); +OC_API::register('get', '/cloud/user/{user}/publickey.{format}', array('OC_API_Cloud', 'getPublicKey')); +OC_API::register('get', '/cloud/user/{user}/privatekey.{format}', array('OC_API_Cloud', 'getPrivateKey')); +?> \ No newline at end of file diff --git a/lib/api.php b/lib/api.php index cf40167b07a..b1176a07077 100644 --- a/lib/api.php +++ b/lib/api.php @@ -29,7 +29,7 @@ class OC_API { /** * api actions */ - protected $actions = array(); + protected static $actions = array(); /** * registers an api call @@ -37,7 +37,7 @@ class OC_API { * @param string $url the url to match * @param callable $action the function to run */ - public function register($method, $url, $action){ + public static function register($method, $url, $action){ $name = strtolower($method).$url; if(!isset(self::$actions[$name])){ OC_Router::create($name, $url) @@ -51,7 +51,7 @@ class OC_API { * handles an api call * @param array $parameters */ - public function call($parameters){ + public static function call($parameters){ // Get the routes // TODO cache @@ -61,6 +61,8 @@ class OC_API { require_once($file); } } + // include core routes + require_once(OC::$SERVERROOT.'core/routes.php'); $name = $parameters['_name']; $response = array(); -- cgit v1.2.3 From 9072106048265ce144227605c8919104acf6d746 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Mon, 30 Jul 2012 12:42:18 +0000 Subject: Move OCS methods to lib/ocs/.php --- lib/api.php | 2 +- lib/ocs/activity.php | 11 ++++++ lib/ocs/cloud.php | 97 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/ocs/config.php | 16 ++++++++ lib/ocs/person.php | 22 +++++++++++ lib/ocs/privatedata.php | 37 +++++++++++++++++++ 6 files changed, 184 insertions(+), 1 deletion(-) create mode 100644 lib/ocs/activity.php create mode 100644 lib/ocs/cloud.php create mode 100644 lib/ocs/config.php create mode 100644 lib/ocs/person.php create mode 100644 lib/ocs/privatedata.php (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index b1176a07077..2203d86ac94 100644 --- a/lib/api.php +++ b/lib/api.php @@ -62,7 +62,7 @@ class OC_API { } } // include core routes - require_once(OC::$SERVERROOT.'core/routes.php'); + require_once(OC::$SERVERROOT.'ocs/routes.php'); $name = $parameters['_name']; $response = array(); diff --git a/lib/ocs/activity.php b/lib/ocs/activity.php new file mode 100644 index 00000000000..3b090376e72 --- /dev/null +++ b/lib/ocs/activity.php @@ -0,0 +1,11 @@ + \ No newline at end of file diff --git a/lib/ocs/cloud.php b/lib/ocs/cloud.php new file mode 100644 index 00000000000..d0cd72e98c5 --- /dev/null +++ b/lib/ocs/cloud.php @@ -0,0 +1,97 @@ +$info['name'],'url'=>OC_Helper::linkToAbsolute($app,''),'icon'=>''); + $values[] = $newvalue; + } + } + return $values; + } + + public static function getQuota($parameters){ + $login=OC_OCS::checkpassword(); + if(OC_Group::inGroup($login, 'admin') or ($login==$parameters['user'])) { + + if(OC_User::userExists($parameters['user'])){ + // calculate the disc space + $user_dir = '/'.$parameters['user'].'/files'; + OC_Filesystem::init($user_dir); + $rootInfo=OC_FileCache::get(''); + $sharedInfo=OC_FileCache::get('/Shared'); + $used=$rootInfo['size']-$sharedInfo['size']; + $free=OC_Filesystem::free_space(); + $total=$free+$used; + if($total==0) $total=1; // prevent division by zero + $relative=round(($used/$total)*10000)/100; + + $xml=array(); + $xml['quota']=$total; + $xml['free']=$free; + $xml['used']=$used; + $xml['relative']=$relative; + + return $xml; + }else{ + return 300; + } + }else{ + return 300; + } + } + + public static function setQuota($parameters){ + $login=OC_OCS::checkpassword(); + if(OC_Group::inGroup($login, 'admin')) { + + // todo + // not yet implemented + // add logic here + error_log('OCS call: user:'.$parameters['user'].' quota:'.$parameters['quota']); + + $xml=array(); + return $xml; + }else{ + return 300; + } + } + + public static function getPublickey($parameters){ + $login=OC_OCS::checkpassword(); + + if(OC_User::userExists($parameters['user'])){ + // calculate the disc space + // TODO + return array(); + }else{ + return 300; + } + } + + public static function getPrivatekey($parameters){ + $login=OC_OCS::checkpassword(); + if(OC_Group::inGroup($login, 'admin') or ($login==$parameters['user'])) { + + if(OC_User::userExists($user)){ + // calculate the disc space + $txt='this is the private key of '.$parameters['user']; + echo($txt); + }else{ + echo self::generateXml('', 'fail', 300, 'User does not exist'); + } + }else{ + echo self::generateXml('', 'fail', 300, 'You don´t have permission to access this ressource.'); + } + } + + +} + +?> \ No newline at end of file diff --git a/lib/ocs/config.php b/lib/ocs/config.php new file mode 100644 index 00000000000..b736abe3b9c --- /dev/null +++ b/lib/ocs/config.php @@ -0,0 +1,16 @@ + \ No newline at end of file diff --git a/lib/ocs/person.php b/lib/ocs/person.php new file mode 100644 index 00000000000..f4e4be5ee09 --- /dev/null +++ b/lib/ocs/person.php @@ -0,0 +1,22 @@ +''){ + if(OC_User::login($parameters['login'],$parameters['password'])){ + $xml['person']['personid'] = $parameters['login']; + return $xml; + }else{ + return 102; + } + }else{ + return 101; + } + + } + +} + +?> \ No newline at end of file diff --git a/lib/ocs/privatedata.php b/lib/ocs/privatedata.php new file mode 100644 index 00000000000..cb62d60a8d3 --- /dev/null +++ b/lib/ocs/privatedata.php @@ -0,0 +1,37 @@ +$log) { + $xml[$i]['key']=$log['key']; + $xml[$i]['app']=$log['app']; + $xml[$i]['value']=$log['value']; + } + return $xml; + //TODO: replace 'privatedata' with 'attribute' once a new libattice has been released that works with it + } + + public static function privatedataSet($parameters){ + $user = OC_OCS::checkpassword(); + if(OC_OCS::setData($user,$app,$key,$value)){ + return 100; + } + } + + public static function privatedataDelete($parameteres){ + $user = OC_OCS::checkpassword(); + if($key=="" or $app==""){ + return; //key and app are NOT optional here + } + if(OC_OCS::deleteData($user,$app,$key)){ + return 100; + } + } + +} + +?> \ No newline at end of file -- cgit v1.2.3 From 9ffaea480fc77514ac1804ad3ca72487c7ba40e4 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Mon, 30 Jul 2012 12:44:34 +0000 Subject: Add the format parameter inside OC_API --- lib/api.php | 2 +- ocs/routes.php | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index 2203d86ac94..c61f50c1bc9 100644 --- a/lib/api.php +++ b/lib/api.php @@ -40,7 +40,7 @@ class OC_API { public static function register($method, $url, $action){ $name = strtolower($method).$url; if(!isset(self::$actions[$name])){ - OC_Router::create($name, $url) + OC_Router::create($name, $url.'.{format}') ->action('OC_API', 'call'); self::$actions[$name] = array(); } diff --git a/ocs/routes.php b/ocs/routes.php index e2f70342b85..2f8ab2a8f6a 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -6,20 +6,20 @@ */ // Config -OC_API::register('get', '/config.{format}', array('OC_OCS_Config', 'apiConfig')); +OC_API::register('get', '/config', array('OC_OCS_Config', 'apiConfig')); // Person -OC_API::register('post', '/person/check.{format}', array('OC_OCS_Person', 'check')); +OC_API::register('post', '/person/check', array('OC_OCS_Person', 'check')); // Activity -OC_API::register('get', '/activity.{format}', array('OC_OCS_Activity', 'activityGet')); +OC_API::register('get', '/activity', array('OC_OCS_Activity', 'activityGet')); // Privatedata -OC_API::register('get', '/privatedata/getattribute/{app}/{key}.{format}', array('OC_OCS_Privatedata', 'privatedataGet')); -OC_API::register('post', '/privatedata/setattribute/{app}/{key}.{format}', array('OC_OCS_Privatedata', 'privatedataPut')); -OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}.{format}', array('OC_OCS_Privatedata', 'privatedataDelete')); +OC_API::register('get', '/privatedata/getattribute/{app}/{key}', array('OC_OCS_Privatedata', 'privatedataGet')); +OC_API::register('post', '/privatedata/setattribute/{app}/{key}', array('OC_OCS_Privatedata', 'privatedataPut')); +OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}', array('OC_OCS_Privatedata', 'privatedataDelete')); // Cloud -OC_API::register('get', '/cloud/system/webapps.{format}', array('OC_OCS_Cloud', 'systemwebapps')); -OC_API::register('get', '/cloud/user/{user}.{format}', array('OC_OCS_Cloud', 'getQuota')); -OC_API::register('post', '/cloud/user/{user}.{format}', array('OC_OCS_Cloud', 'setQuota')); -OC_API::register('get', '/cloud/user/{user}/publickey.{format}', array('OC_OCS_Cloud', 'getPublicKey')); -OC_API::register('get', '/cloud/user/{user}/privatekey.{format}', array('OC_OCS_Cloud', 'getPrivateKey')); +OC_API::register('get', '/cloud/system/webapps', array('OC_OCS_Cloud', 'systemwebapps')); +OC_API::register('get', '/cloud/user/{user}', array('OC_OCS_Cloud', 'getQuota')); +OC_API::register('post', '/cloud/user/{user}', array('OC_OCS_Cloud', 'setQuota')); +OC_API::register('get', '/cloud/user/{user}/publickey', array('OC_OCS_Cloud', 'getPublicKey')); +OC_API::register('get', '/cloud/user/{user}/privatekey', array('OC_OCS_Cloud', 'getPrivateKey')); ?> \ No newline at end of file -- cgit v1.2.3 From b563dff10a60e08ad270dc78404102f082abf184 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Mon, 30 Jul 2012 12:56:01 +0000 Subject: Record the app that is registering a call to use later with OAuth --- lib/api.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index c61f50c1bc9..46f58debdcf 100644 --- a/lib/api.php +++ b/lib/api.php @@ -36,15 +36,16 @@ class OC_API { * @param string $method the http method * @param string $url the url to match * @param callable $action the function to run + * @param string $app the id of the app registering the call */ - public static function register($method, $url, $action){ + public static function register($method, $url, $action, $app){ $name = strtolower($method).$url; if(!isset(self::$actions[$name])){ OC_Router::create($name, $url.'.{format}') ->action('OC_API', 'call'); self::$actions[$name] = array(); } - self::$actions[$name][] = $action; + self::$actions[$name][] = array('app' => $app, 'action' => $action); } /** @@ -68,8 +69,8 @@ class OC_API { $response = array(); // Loop through registered actions foreach(self::$actions[$name] as $action){ - if(is_callable($action)){ - $action_response = call_user_func($action, $parameters); + if(is_callable($action['action'])){ + $action_response = call_user_func($action['action'], $parameters); if(is_array($action_response)){ // Merge with previous $response = array_merge($response, $action_response); -- cgit v1.2.3 From b0dc4383e14713a79c67f71e8e3f3c1c09d8958c Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Mon, 30 Jul 2012 12:57:35 +0000 Subject: Clean code slightly --- lib/api.php | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index 46f58debdcf..17663b53b84 100644 --- a/lib/api.php +++ b/lib/api.php @@ -55,15 +55,7 @@ class OC_API { public static function call($parameters){ // Get the routes - // TODO cache - foreach(OC_APP::getEnabledApps() as $app){ - $file = OC_App::getAppPath($app).'/appinfo/routes.php'; - if(file_exists($file)){ - require_once($file); - } - } - // include core routes - require_once(OC::$SERVERROOT.'ocs/routes.php'); + self::loadRoutes(); $name = $parameters['_name']; $response = array(); @@ -91,6 +83,21 @@ class OC_API { } } + /** + * loads the api routes + */ + private static function loadRoutes(){ + // TODO cache + foreach(OC_APP::getEnabledApps() as $app){ + $file = OC_App::getAppPath($app).'/appinfo/routes.php'; + if(file_exists($file)){ + require_once($file); + } + } + // include core routes + require_once(OC::$SERVERROOT.'ocs/routes.php'); + } + /** * respond to a call * @param int|array $response the response -- cgit v1.2.3 From c7c16ac49b661d5087cd64612bce1da5630424b0 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Mon, 30 Jul 2012 13:39:06 +0000 Subject: Improve merging of api responses --- lib/api.php | 47 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 12 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index 17663b53b84..02c3f77e5c2 100644 --- a/lib/api.php +++ b/lib/api.php @@ -58,23 +58,17 @@ class OC_API { self::loadRoutes(); $name = $parameters['_name']; - $response = array(); // Loop through registered actions foreach(self::$actions[$name] as $action){ + $app = $action['app']; if(is_callable($action['action'])){ - $action_response = call_user_func($action['action'], $parameters); - if(is_array($action_response)){ - // Merge with previous - $response = array_merge($response, $action_response); - } else { - // TODO - Something failed, do we return an error code, depends on other action responses - } + $responses[] = array('app' => $app, 'response' => call_user_func($action['action'], $parameters)); } else { - // Action not callable - // log - // TODO - Depending on other action responses, do we return a 501? + $responses[] = array('app' => $app, 'response' => 501); } } + // Merge the responses + $response = self::mergeResponses($responses); // Send the response if(isset($parameters['_format'])){ self::respond($response, $parameters['_format']); @@ -83,6 +77,35 @@ class OC_API { } } + /** + * intelligently merges the different responses + * @param array $responses + * @return array the final merged response + */ + private static function mergeResponses($responses){ + $finalresponse = array(); + $numresponses = count($responses); + + // TODO - This is only a temporary merge. If keys match and value is another array we want to compare deeper in the array + foreach($responses as $response){ + if(is_int($response) && empty($finalresponse)){ + $finalresponse = $response; + continue; + } + if(is_array($response)){ + // Shipped apps win + if(OC_App::isShipped($response['app'])){ + $finalresponse = array_merge($finalresponse, $response); + } else { + $finalresponse = array_merge($response, $finalresponse); + } + } + } + // END TODO + + return $finalresponse; + } + /** * loads the api routes */ @@ -107,4 +130,4 @@ class OC_API { // TODO respond in the correct format } - } \ No newline at end of file +} \ No newline at end of file -- cgit v1.2.3 From 3a0e3708a50a0672c94c79e165aa834dfe8f4e9a Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Mon, 30 Jul 2012 14:26:15 +0000 Subject: Add public class for registering api calls --- lib/public/api.php | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 lib/public/api.php (limited to 'lib') diff --git a/lib/public/api.php b/lib/public/api.php new file mode 100644 index 00000000000..270aa893297 --- /dev/null +++ b/lib/public/api.php @@ -0,0 +1,41 @@ +. +* +*/ + +namespace OCP; + +/** + * This class provides functions to manage apps in ownCloud + */ +class API { + + /** + * registers an api call + * @param string $method the http method + * @param string $url the url to match + * @param callable $action the function to run + * @param string $app the id of the app registering the call + */ + public function register($method, $url, $action, $app){ + OC_API::register($method, $url, $action, $app); + } + +} -- cgit v1.2.3 From 2f84a8d74627cb20cfae1ac4c004af393b8b07de Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Mon, 30 Jul 2012 16:04:09 +0000 Subject: Merge the responses recursively --- lib/api.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index 02c3f77e5c2..757e53226b9 100644 --- a/lib/api.php +++ b/lib/api.php @@ -86,7 +86,6 @@ class OC_API { $finalresponse = array(); $numresponses = count($responses); - // TODO - This is only a temporary merge. If keys match and value is another array we want to compare deeper in the array foreach($responses as $response){ if(is_int($response) && empty($finalresponse)){ $finalresponse = $response; @@ -95,13 +94,12 @@ class OC_API { if(is_array($response)){ // Shipped apps win if(OC_App::isShipped($response['app'])){ - $finalresponse = array_merge($finalresponse, $response); + $finalresponse = array_merge_recursive($finalresponse, $response); } else { - $finalresponse = array_merge($response, $finalresponse); + $finalresponse = array_merge_recursive($response, $finalresponse); } } } - // END TODO return $finalresponse; } -- cgit v1.2.3 From 0271bfa3b7849de64bfbb9dd96313fc35da14e29 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Mon, 30 Jul 2012 20:48:03 +0200 Subject: Move loading of routes to OC_Router --- lib/api.php | 19 ------------------- lib/router.php | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 19 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index 757e53226b9..00a3dc108e1 100644 --- a/lib/api.php +++ b/lib/api.php @@ -53,10 +53,6 @@ class OC_API { * @param array $parameters */ public static function call($parameters){ - - // Get the routes - self::loadRoutes(); - $name = $parameters['_name']; // Loop through registered actions foreach(self::$actions[$name] as $action){ @@ -104,21 +100,6 @@ class OC_API { return $finalresponse; } - /** - * loads the api routes - */ - private static function loadRoutes(){ - // TODO cache - foreach(OC_APP::getEnabledApps() as $app){ - $file = OC_App::getAppPath($app).'/appinfo/routes.php'; - if(file_exists($file)){ - require_once($file); - } - } - // include core routes - require_once(OC::$SERVERROOT.'ocs/routes.php'); - } - /** * respond to a call * @param int|array $response the response diff --git a/lib/router.php b/lib/router.php index f037ecdfef4..f76f64ac82b 100644 --- a/lib/router.php +++ b/lib/router.php @@ -16,6 +16,21 @@ class OC_Router { protected $collections = array(); protected $collection = null; + /** + * loads the api routes + */ + public function loadRoutes(){ + // TODO cache + foreach(OC_APP::getEnabledApps() as $app){ + $file = OC_App::getAppPath($app).'/appinfo/routes.php'; + if(file_exists($file)){ + require_once($file); + } + } + // include ocs routes + require_once(OC::$SERVERROOT.'/ocs/routes.php'); + } + public function useCollection($name) { if (!isset($this->collections[$name])) { $this->collections[$name] = new RouteCollection(); -- cgit v1.2.3 From 95d3b83a77f189569bbf38a54f771af1b85a9406 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Mon, 30 Jul 2012 20:50:32 +0200 Subject: Create OC_Router in OC::init --- lib/base.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib') diff --git a/lib/base.php b/lib/base.php index 5041f43648e..29a3502e352 100644 --- a/lib/base.php +++ b/lib/base.php @@ -62,6 +62,10 @@ class OC{ * requested file of app */ public static $REQUESTEDFILE = ''; + /* + * OC router + */ + public static $router = null; /** * check if owncloud runs in cli mode */ @@ -354,6 +358,8 @@ class OC{ OC_User::useBackend(new OC_User_Database()); OC_Group::useBackend(new OC_Group_Database()); + OC::$router = new OC_Router(); + // Load Apps // This includes plugins for users and filesystems as well global $RUNTIME_NOAPPS; -- cgit v1.2.3 From 180bd69dbb21dc6e53533a7d93972445b2ff922e Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Mon, 30 Jul 2012 20:52:47 +0200 Subject: Fix OC_API::register --- lib/api.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index 00a3dc108e1..fd2c621f389 100644 --- a/lib/api.php +++ b/lib/api.php @@ -40,8 +40,10 @@ class OC_API { */ public static function register($method, $url, $action, $app){ $name = strtolower($method).$url; + $name = str_replace(array('/', '{', '}'), '_', $name); if(!isset(self::$actions[$name])){ - OC_Router::create($name, $url.'.{format}') + OC::$router->create($name, $url.'.{_format}') + ->defaults(array('_format'=>'xml')) ->action('OC_API', 'call'); self::$actions[$name] = array(); } -- cgit v1.2.3 From 7a24f0cd8d28e60360127da19e40bff4b2e04168 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Mon, 30 Jul 2012 21:03:41 +0200 Subject: Make calling ocs/v1.php/config work --- lib/api.php | 17 ++++++++++++----- lib/app.php | 2 +- lib/ocs.php | 18 ++++++++++++++++++ ocs/v1.php | 12 ++++++++++-- 4 files changed, 41 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index fd2c621f389..515bab6714e 100644 --- a/lib/api.php +++ b/lib/api.php @@ -43,7 +43,8 @@ class OC_API { $name = str_replace(array('/', '{', '}'), '_', $name); if(!isset(self::$actions[$name])){ OC::$router->create($name, $url.'.{_format}') - ->defaults(array('_format'=>'xml')) + ->defaults(array('_format' => 'xml')) + ->requirements(array('_format' => 'xml|json')) ->action('OC_API', 'call'); self::$actions[$name] = array(); } @@ -55,7 +56,7 @@ class OC_API { * @param array $parameters */ public static function call($parameters){ - $name = $parameters['_name']; + $name = $parameters['_route']; // Loop through registered actions foreach(self::$actions[$name] as $action){ $app = $action['app']; @@ -107,8 +108,14 @@ class OC_API { * @param int|array $response the response * @param string $format the format xml|json */ - private function respond($response, $format='json'){ - // TODO respond in the correct format + private static function respond($response, $format='json'){ + if ($format == 'json') { + echo json_encode($response); + } else if ($format == 'xml') { + // TODO array to xml + } else { + var_dump($format, $response); + } } -} \ No newline at end of file +} diff --git a/lib/app.php b/lib/app.php index 60bd0ef476b..7863153d9b9 100644 --- a/lib/app.php +++ b/lib/app.php @@ -145,7 +145,7 @@ class OC_App{ * @param string $appid the id of the app to check * @return bool */ - public function isShipped($appid){ + public static function isShipped($appid){ $info = self::getAppInfo($appid); if(isset($info['shipped']) && $info['shipped']=='true'){ return true; diff --git a/lib/ocs.php b/lib/ocs.php index d7a7951fab5..780fd4a6581 100644 --- a/lib/ocs.php +++ b/lib/ocs.php @@ -251,6 +251,24 @@ class OC_OCS { exit(); } + public static function notFound() { + if($_SERVER['REQUEST_METHOD'] == 'GET') { + $method='get'; + }elseif($_SERVER['REQUEST_METHOD'] == 'PUT') { + $method='put'; + parse_str(file_get_contents("php://input"),$put_vars); + }elseif($_SERVER['REQUEST_METHOD'] == 'POST') { + $method='post'; + }else{ + echo('internal server error: method not supported'); + exit(); + } + $format = self::readData($method, 'format', 'text', ''); + $txt='Invalid query, please check the syntax. API specifications are here: http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n"; + $txt.=OC_OCS::getDebugOutput(); + echo(OC_OCS::generateXml($format,'failed',999,$txt)); + } + /** * generated some debug information to make it easier to find faild API calls * @return debug data string diff --git a/ocs/v1.php b/ocs/v1.php index ab0dc80f4ba..4580221e600 100644 --- a/ocs/v1.php +++ b/ocs/v1.php @@ -22,5 +22,13 @@ */ require_once('../lib/base.php'); -@ob_clean(); -OC_OCS::handle(); +use Symfony\Component\Routing\Exception\ResourceNotFoundException; + +OC::$router->useCollection('ocs'); +OC::$router->loadRoutes(); + +try { + OC::$router->match($_SERVER['PATH_INFO']); +} catch (ResourceNotFoundException $e) { + OC_OCS::notFound(); +} -- cgit v1.2.3 From 0a9ca42c3479e1ebd0efee2bfae10958677bb657 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Mon, 30 Jul 2012 21:13:29 +0200 Subject: Fix OC_OCS_Privatedata::privateDataGet --- lib/ocs/privatedata.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/ocs/privatedata.php b/lib/ocs/privatedata.php index cb62d60a8d3..77214046911 100644 --- a/lib/ocs/privatedata.php +++ b/lib/ocs/privatedata.php @@ -3,7 +3,10 @@ class OC_OCS_Privatedata { public static function privatedataGet($parameters){ - $user = OC_OCS::checkpassword(); + // TODO check user auth + $user = OC_User::getUser(); + $app = addslashes(strip_tags($parameters['app'])); + $key = addslashes(strip_tags($parameters['key'])); $result = OC_OCS::getData($user,$app,$key); $xml= array(); foreach($result as $i=>$log) { @@ -34,4 +37,4 @@ class OC_OCS_Privatedata { } -?> \ No newline at end of file +?> -- cgit v1.2.3 From cc6911e1f709edc42ea5558e19fcdeea75cdcf39 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Tue, 31 Jul 2012 09:28:12 +0000 Subject: Make method static --- lib/public/api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/public/api.php b/lib/public/api.php index 270aa893297..518e6f00970 100644 --- a/lib/public/api.php +++ b/lib/public/api.php @@ -34,7 +34,7 @@ class API { * @param callable $action the function to run * @param string $app the id of the app registering the call */ - public function register($method, $url, $action, $app){ + public static function register($method, $url, $action, $app){ OC_API::register($method, $url, $action, $app); } -- cgit v1.2.3 From b05639e745cabf8d11785f673593680448d844a2 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Tue, 31 Jul 2012 10:10:15 +0000 Subject: Fix error with namespacing --- lib/public/api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/public/api.php b/lib/public/api.php index 518e6f00970..ed1f6ef237c 100644 --- a/lib/public/api.php +++ b/lib/public/api.php @@ -35,7 +35,7 @@ class API { * @param string $app the id of the app registering the call */ public static function register($method, $url, $action, $app){ - OC_API::register($method, $url, $action, $app); + \OC_API::register($method, $url, $action, $app); } } -- cgit v1.2.3 From 5922599f48b8eb2403265f4e4a5dad3899d3ebc6 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Tue, 31 Jul 2012 12:10:42 +0100 Subject: Handle function not needed in lib/ocs.php --- lib/ocs.php | 181 ------------------------------------------------------------ 1 file changed, 181 deletions(-) (limited to 'lib') diff --git a/lib/ocs.php b/lib/ocs.php index 780fd4a6581..d0b835b522b 100644 --- a/lib/ocs.php +++ b/lib/ocs.php @@ -70,187 +70,6 @@ class OC_OCS { } } - /** - main function to handle the REST request - **/ - public static function handle() { - // overwrite the 404 error page returncode - header("HTTP/1.0 200 OK"); - - - if($_SERVER['REQUEST_METHOD'] == 'GET') { - $method='get'; - }elseif($_SERVER['REQUEST_METHOD'] == 'PUT') { - $method='put'; - parse_str(file_get_contents("php://input"),$put_vars); - }elseif($_SERVER['REQUEST_METHOD'] == 'POST') { - $method='post'; - }else{ - echo('internal server error: method not supported'); - exit(); - } - - $format = self::readData($method, 'format', 'text', ''); - - $router = new OC_Router(); - $router->useCollection('ocs'); - // CONFIG - $router->create('config', '/config.{format}') - ->defaults(array('format' => $format)) - ->action('OC_OCS', 'apiConfig') - ->requirements(array('format'=>'xml|json')); - - // PERSON - $router->create('person_check', '/person/check.{format}') - ->post() - ->defaults(array('format' => $format)) - ->action(function ($parameters) { - $format = $parameters['format']; - $login = OC_OCS::readData('post', 'login', 'text'); - $passwd = OC_OCS::readData('post', 'password', 'text'); - OC_OCS::personCheck($format,$login,$passwd); - }) - ->requirements(array('format'=>'xml|json')); - - // ACTIVITY - // activityget - GET ACTIVITY page,pagesize als urlparameter - $router->create('activity_get', '/activity.{format}') - ->defaults(array('format' => $format)) - ->action(function ($parameters) { - $format = $parameters['format']; - $page = OC_OCS::readData('get', 'page', 'int', 0); - $pagesize = OC_OCS::readData('get', 'pagesize', 'int', 10); - if($pagesize<1 or $pagesize>100) $pagesize=10; - OC_OCS::activityGet($format, $page, $pagesize); - }) - ->requirements(array('format'=>'xml|json')); - // activityput - POST ACTIVITY - $router->create('activity_put', '/activity.{format}') - ->post() - ->defaults(array('format' => $format)) - ->action(function ($parameters) { - $format = $parameters['format']; - $message = OC_OCS::readData('post', 'message', 'text'); - OC_OCS::activityPut($format,$message); - }) - ->requirements(array('format'=>'xml|json')); - - // PRIVATEDATA - // get - GET DATA - $router->create('privatedata_get', - '/privatedata/getattribute/{app}/{key}.{format}') - ->defaults(array('app' => '', 'key' => '', 'format' => $format)) - ->action(function ($parameters) { - $format = $parameters['format']; - $app = addslashes(strip_tags($parameters['app'])); - $key = addslashes(strip_tags($parameters['key'])); - OC_OCS::privateDataGet($format, $app, $key); - }) - ->requirements(array('format'=>'xml|json')); - // set - POST DATA - $router->create('privatedata_set', - '/privatedata/setattribute/{app}/{key}.{format}') - ->post() - ->defaults(array('format' => $format)) - ->action(function ($parameters) { - $format = $parameters['format']; - $app = addslashes(strip_tags($parameters['app'])); - $key = addslashes(strip_tags($parameters['key'])); - $value=OC_OCS::readData('post', 'value', 'text'); - OC_OCS::privateDataSet($format, $app, $key, $value); - }) - ->requirements(array('format'=>'xml|json')); - // delete - POST DATA - $router->create('privatedata_delete', - '/privatedata/deleteattribute/{app}/{key}.{format}') - ->post() - ->defaults(array('format' => $format)) - ->action(function ($parameters) { - $format = $parameters['format']; - $app = addslashes(strip_tags($parameters['app'])); - $key = addslashes(strip_tags($parameters['key'])); - OC_OCS::privateDataDelete($format, $app, $key); - }) - ->requirements(array('format'=>'xml|json')); - - // CLOUD - // systemWebApps - $router->create('system_webapps', - '/cloud/system/webapps.{format}') - ->defaults(array('format' => $format)) - ->action(function ($parameters) { - $format = $parameters['format']; - OC_OCS::systemwebapps($format); - }) - ->requirements(array('format'=>'xml|json')); - - // quotaget - $router->create('quota_get', - '/cloud/user/{user}.{format}') - ->defaults(array('format' => $format)) - ->action(function ($parameters) { - $format = $parameters['format']; - $user = $parameters['user']; - OC_OCS::quotaGet($format, $user); - }) - ->requirements(array('format'=>'xml|json')); - // quotaset - $router->create('quota_set', - '/cloud/user/{user}.{format}') - ->post() - ->defaults(array('format' => $format)) - ->action(function ($parameters) { - $format = $parameters['format']; - $user = $parameters['user']; - $quota = self::readData('post', 'quota', 'int'); - OC_OCS::quotaSet($format, $user, $quota); - }) - ->requirements(array('format'=>'xml|json')); - - // keygetpublic - $router->create('keygetpublic', - '/cloud/user/{user}/publickey.{format}') - ->defaults(array('format' => $format)) - ->action(function ($parameters) { - $format = $parameters['format']; - $user = $parameters['user']; - OC_OCS::publicKeyGet($format,$user); - }) - ->requirements(array('format'=>'xml|json')); - - // keygetprivate - $router->create('keygetpublic', - '/cloud/user/{user}/privatekey.{format}') - ->defaults(array('format' => $format)) - ->action(function ($parameters) { - $format = $parameters['format']; - $user = $parameters['user']; - OC_OCS::privateKeyGet($format,$user); - }) - ->requirements(array('format'=>'xml|json')); - - -// add more calls here -// please document all the call in the draft spec -// http://www.freedesktop.org/wiki/Specifications/open-collaboration-services-1.7#CLOUD - -// TODO: -// users -// groups -// bookmarks -// sharing -// versioning -// news (rss) - try { - $router->match($_SERVER['PATH_INFO']); - } catch (ResourceNotFoundException $e) { - $txt='Invalid query, please check the syntax. API specifications are here: http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n"; - $txt.=OC_OCS::getdebugoutput(); - echo(OC_OCS::generatexml($format,'failed',999,$txt)); - } - exit(); - } - public static function notFound() { if($_SERVER['REQUEST_METHOD'] == 'GET') { $method='get'; -- cgit v1.2.3 From 78bbcc8aeac5585a11dca0c1dc77cdd420182744 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Tue, 31 Jul 2012 14:34:45 +0100 Subject: Basic OAuth class based on oauth-php. WIP --- lib/oauth.php | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 lib/oauth.php (limited to 'lib') diff --git a/lib/oauth.php b/lib/oauth.php new file mode 100644 index 00000000000..0eade6ab906 --- /dev/null +++ b/lib/oauth.php @@ -0,0 +1,128 @@ +. +* +*/ + +class OC_OAuth { + + /** + * the oauth-php server object + */ + private static $server; + + /** + * the oauth-php oauthstore object + */ + private static $store; + + /** + * initialises the OAuth store and server + */ + private static function init(){ + // Include the libraries + require_once(OC::$SERVERROOT.'3rdparty/oauth-php/library/OAuthServer.php'); + require_once(OC::$SERVERROOT.'3rdparty/oauth-php/library/OAuthStore.php'); + // Create the server object + self::$server = new OAuthServer(); + // Initialise the OAuth store + self::$store = OAuthStore::instance('owncloud'); + } + + /** + * gets a request token + * TODO save the scopes in the database with this token + */ + public static function getRequestToken(){ + self::init(); + self::$server->requestToken(); + } + + /** + * get the scopes requested by this token + * @param string $requesttoken + * @return array scopes + */ + public static function getScopes($requesttoken){ + // TODO + } + + /** + * exchanges authorised request token for access token + */ + public static function getAccessToken(){ + self::init(); + self::$server->accessToken(); + } + + /** + * registers a new consumer + * @param array $details consumer details, keys requester_name and requester_email required + * @param string $user the owncloud user adding the consumer + * @return array the consumers details including secret and key + */ + public static function registerConsumer($details, $user=null){ + self::init(); + $user = is_null($user) ? OC_User::getUser() : $user; + $consumer = self::$store->updateConsumer($details, $user, OC_Group::inGroup($user, 'admin')); + return $consumer; + } + + /** + * gets a list of consumers + * @param string $user + */ + public static function getConsumers($user=null){ + $user = is_null($user) ? OC_User::getUser() : $user; + return self::$store->listConsumers($user); + } + + /** + * authorises a request token - redirects to callback + * @param string $user + * @param bool $authorised + */ + public static function authoriseToken($user=null){ + $user = is_null($user) ? OC_User::getUser() : $user; + self::$server->authorizeVerify(); + self::$server->authorize($authorised, $user); + } + + /** + * checks if request is authorised + * TODO distinguish between failures as one is a 400 error and other is 401 + * @return string|int + */ + public static function isAuthorised(){ + if(OAuthRequestVerifier::requestIsSigned()){ + try{ + $req = new OAuthRequestVerifier(); + $user = $req->verify(); + return $user; + } catch(OAuthException $e) { + // 401 Unauthorised + return false; + } + } else { + // Bad request + return false; + } + } + +} \ No newline at end of file -- cgit v1.2.3 From ce41f3801eecc47f578ce8698cc69de16a16330b Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Tue, 31 Jul 2012 14:59:07 +0100 Subject: Actually login the user when using OAuth --- lib/oauth.php | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib') diff --git a/lib/oauth.php b/lib/oauth.php index 0eade6ab906..f0341b4b0d8 100644 --- a/lib/oauth.php +++ b/lib/oauth.php @@ -114,6 +114,13 @@ class OC_OAuth { try{ $req = new OAuthRequestVerifier(); $user = $req->verify(); + $run = true; + OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $user )); + if(!$run){ + return false; + } + OC_User::setUserId($user); + OC_Hook::emit( "OC_User", "post_login", array( "uid" => $user )); return $user; } catch(OAuthException $e) { // 401 Unauthorised -- cgit v1.2.3 From fcf3dbcfc13888a795a85f54179dfd548b34d4aa Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Tue, 31 Jul 2012 15:02:51 +0100 Subject: Require a username for OC_OAuth::registerConsumer() --- lib/oauth.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/oauth.php b/lib/oauth.php index f0341b4b0d8..98678d29110 100644 --- a/lib/oauth.php +++ b/lib/oauth.php @@ -77,9 +77,8 @@ class OC_OAuth { * @param string $user the owncloud user adding the consumer * @return array the consumers details including secret and key */ - public static function registerConsumer($details, $user=null){ + public static function registerConsumer($details, $user){ self::init(); - $user = is_null($user) ? OC_User::getUser() : $user; $consumer = self::$store->updateConsumer($details, $user, OC_Group::inGroup($user, 'admin')); return $consumer; } -- cgit v1.2.3 From c2bdb5c71640567e0be3c2fc7e4d32af1469a55e Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Tue, 31 Jul 2012 22:18:16 +0200 Subject: Fix require 3rdpartypath --- lib/oauth.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/oauth.php b/lib/oauth.php index 98678d29110..09dbe4cc755 100644 --- a/lib/oauth.php +++ b/lib/oauth.php @@ -37,8 +37,8 @@ class OC_OAuth { */ private static function init(){ // Include the libraries - require_once(OC::$SERVERROOT.'3rdparty/oauth-php/library/OAuthServer.php'); - require_once(OC::$SERVERROOT.'3rdparty/oauth-php/library/OAuthStore.php'); + require_once(OC::$THIRDPARTYROOT.'3rdparty/oauth-php/library/OAuthServer.php'); + require_once(OC::$THIRDPARTYROOT.'3rdparty/oauth-php/library/OAuthStore.php'); // Create the server object self::$server = new OAuthServer(); // Initialise the OAuth store -- cgit v1.2.3 From 28537037ae27a8e766d3c4ef129422dc02b45d5f Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Tue, 31 Jul 2012 22:19:11 +0200 Subject: Fixup OCS modules --- lib/ocs/activity.php | 3 --- lib/ocs/cloud.php | 53 ++++++++++++++++++++++++------------------------- lib/ocs/config.php | 3 --- lib/ocs/person.php | 4 ---- lib/ocs/privatedata.php | 22 +++++++++++--------- ocs/routes.php | 16 +++++++-------- 6 files changed, 47 insertions(+), 54 deletions(-) (limited to 'lib') diff --git a/lib/ocs/activity.php b/lib/ocs/activity.php index 3b090376e72..07b571665ec 100644 --- a/lib/ocs/activity.php +++ b/lib/ocs/activity.php @@ -5,7 +5,4 @@ class OC_OCS_Activity { public static function activityGet($parameters){ // TODO } - } - -?> \ No newline at end of file diff --git a/lib/ocs/cloud.php b/lib/ocs/cloud.php index d0cd72e98c5..2f2aad714a3 100644 --- a/lib/ocs/cloud.php +++ b/lib/ocs/cloud.php @@ -2,8 +2,8 @@ class OC_OCS_Cloud { - public static function systemwebapps($parameters){ - $login = OC_OCS::checkpassword(); + public static function getSystemWebApps($parameters){ + OC_Util::checkLoggedIn(); $apps = OC_App::getEnabledApps(); $values = array(); foreach($apps as $app) { @@ -16,9 +16,10 @@ class OC_OCS_Cloud { return $values; } - public static function getQuota($parameters){ - $login=OC_OCS::checkpassword(); - if(OC_Group::inGroup($login, 'admin') or ($login==$parameters['user'])) { + public static function getUserQuota($parameters){ + OC_Util::checkLoggedIn(); + $user = OC_User::getUser(); + if(OC_Group::inGroup($user, 'admin') or ($user==$parameters['user'])) { if(OC_User::userExists($parameters['user'])){ // calculate the disc space @@ -47,9 +48,10 @@ class OC_OCS_Cloud { } } - public static function setQuota($parameters){ - $login=OC_OCS::checkpassword(); - if(OC_Group::inGroup($login, 'admin')) { + public static function setUserQuota($parameters){ + OC_Util::checkLoggedIn(); + $user = OC_User::getUser(); + if(OC_Group::inGroup($user, 'admin')) { // todo // not yet implemented @@ -63,8 +65,8 @@ class OC_OCS_Cloud { } } - public static function getPublickey($parameters){ - $login=OC_OCS::checkpassword(); + public static function getUserPublickey($parameters){ + OC_Util::checkLoggedIn(); if(OC_User::userExists($parameters['user'])){ // calculate the disc space @@ -75,23 +77,20 @@ class OC_OCS_Cloud { } } - public static function getPrivatekey($parameters){ - $login=OC_OCS::checkpassword(); - if(OC_Group::inGroup($login, 'admin') or ($login==$parameters['user'])) { + public static function getUserPrivatekey($parameters){ + OC_Util::checkLoggedIn(); + $user = OC_User::getUser(); + if(OC_Group::inGroup($user, 'admin') or ($user==$parameters['user'])) { - if(OC_User::userExists($user)){ - // calculate the disc space - $txt='this is the private key of '.$parameters['user']; - echo($txt); - }else{ - echo self::generateXml('', 'fail', 300, 'User does not exist'); - } - }else{ - echo self::generateXml('', 'fail', 300, 'You don´t have permission to access this ressource.'); - } + if(OC_User::userExists($user)){ + // calculate the disc space + $txt='this is the private key of '.$parameters['user']; + echo($txt); + }else{ + echo self::generateXml('', 'fail', 300, 'User does not exist'); + } + }else{ + echo self::generateXml('', 'fail', 300, 'You don´t have permission to access this ressource.'); + } } - - } - -?> \ No newline at end of file diff --git a/lib/ocs/config.php b/lib/ocs/config.php index b736abe3b9c..06103cbeb4f 100644 --- a/lib/ocs/config.php +++ b/lib/ocs/config.php @@ -10,7 +10,4 @@ class OC_OCS_Config { $xml['ssl'] = 'false'; return $xml; } - } - -?> \ No newline at end of file diff --git a/lib/ocs/person.php b/lib/ocs/person.php index f4e4be5ee09..629a7c2e6c7 100644 --- a/lib/ocs/person.php +++ b/lib/ocs/person.php @@ -14,9 +14,5 @@ class OC_OCS_Person { }else{ return 101; } - } - } - -?> \ No newline at end of file diff --git a/lib/ocs/privatedata.php b/lib/ocs/privatedata.php index 77214046911..1c781dece8a 100644 --- a/lib/ocs/privatedata.php +++ b/lib/ocs/privatedata.php @@ -2,8 +2,8 @@ class OC_OCS_Privatedata { - public static function privatedataGet($parameters){ - // TODO check user auth + public static function get($parameters){ + OC_Util::checkLoggedIn(); $user = OC_User::getUser(); $app = addslashes(strip_tags($parameters['app'])); $key = addslashes(strip_tags($parameters['key'])); @@ -18,15 +18,22 @@ class OC_OCS_Privatedata { //TODO: replace 'privatedata' with 'attribute' once a new libattice has been released that works with it } - public static function privatedataSet($parameters){ - $user = OC_OCS::checkpassword(); + public static function set($parameters){ + OC_Util::checkLoggedIn(); + $user = OC_User::getUser(); + $app = addslashes(strip_tags($parameters['app'])); + $key = addslashes(strip_tags($parameters['key'])); + $value = OC_OCS::readData('post', 'value', 'text'); if(OC_OCS::setData($user,$app,$key,$value)){ return 100; } } - public static function privatedataDelete($parameteres){ - $user = OC_OCS::checkpassword(); + public static function delete($parameters){ + OC_Util::checkLoggedIn(); + $user = OC_User::getUser(); + $app = addslashes(strip_tags($parameters['app'])); + $key = addslashes(strip_tags($parameters['key'])); if($key=="" or $app==""){ return; //key and app are NOT optional here } @@ -34,7 +41,4 @@ class OC_OCS_Privatedata { return 100; } } - } - -?> diff --git a/ocs/routes.php b/ocs/routes.php index a913254ebe8..95df0c7ec91 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -12,14 +12,14 @@ OC_API::register('post', '/person/check', array('OC_OCS_Person', 'check'), 'ocs' // Activity OC_API::register('get', '/activity', array('OC_OCS_Activity', 'activityGet'), 'ocs'); // Privatedata -OC_API::register('get', '/privatedata/getattribute/{app}/{key}', array('OC_OCS_Privatedata', 'privatedataGet'), 'ocs'); -OC_API::register('post', '/privatedata/setattribute/{app}/{key}', array('OC_OCS_Privatedata', 'privatedataPut'), 'ocs'); -OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}', array('OC_OCS_Privatedata', 'privatedataDelete'), 'ocs'); +OC_API::register('get', '/privatedata/getattribute/{app}/{key}', array('OC_OCS_Privatedata', 'get'), 'ocs'); +OC_API::register('post', '/privatedata/setattribute/{app}/{key}', array('OC_OCS_Privatedata', 'set'), 'ocs'); +OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}', array('OC_OCS_Privatedata', 'delete'), 'ocs'); // Cloud -OC_API::register('get', '/cloud/system/webapps', array('OC_OCS_Cloud', 'systemwebapps'), 'ocs'); -OC_API::register('get', '/cloud/user/{user}', array('OC_OCS_Cloud', 'getQuota'), 'ocs'); -OC_API::register('post', '/cloud/user/{user}', array('OC_OCS_Cloud', 'setQuota'), 'ocs'); -OC_API::register('get', '/cloud/user/{user}/publickey', array('OC_OCS_Cloud', 'getPublicKey'), 'ocs'); -OC_API::register('get', '/cloud/user/{user}/privatekey', array('OC_OCS_Cloud', 'getPrivateKey'), 'ocs'); +OC_API::register('get', '/cloud/system/webapps', array('OC_OCS_Cloud', 'getSystemWebApps'), 'ocs'); +OC_API::register('get', '/cloud/user/{user}', array('OC_OCS_Cloud', 'getUserQuota'), 'ocs'); +OC_API::register('post', '/cloud/user/{user}', array('OC_OCS_Cloud', 'setUserQuota'), 'ocs'); +OC_API::register('get', '/cloud/user/{user}/publickey', array('OC_OCS_Cloud', 'getUserPublicKey'), 'ocs'); +OC_API::register('get', '/cloud/user/{user}/privatekey', array('OC_OCS_Cloud', 'getUserPrivateKey'), 'ocs'); ?> -- cgit v1.2.3 From 9d6a09f58946c8d4e7903d5b25a5fb00f6bcb5e8 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Tue, 31 Jul 2012 22:33:11 +0200 Subject: Routing: Method needs to be uppercase --- lib/route.php | 10 +++++----- lib/router.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/route.php b/lib/route.php index 0d3339add6c..df3a18e844f 100644 --- a/lib/route.php +++ b/lib/route.php @@ -10,27 +10,27 @@ use Symfony\Component\Routing\Route; class OC_Route extends Route { public function method($method) { - $this->setRequirement('_method', $method); + $this->setRequirement('_method', strtoupper($method)); return $this; } public function post() { - $this->method('post'); + $this->method('POST'); return $this; } public function get() { - $this->method('get'); + $this->method('GET'); return $this; } public function put() { - $this->method('put'); + $this->method('PUT'); return $this; } public function delete() { - $this->method('delete'); + $this->method('DELETE'); return $this; } diff --git a/lib/router.php b/lib/router.php index f76f64ac82b..c3864cfc91c 100644 --- a/lib/router.php +++ b/lib/router.php @@ -51,7 +51,7 @@ class OC_Router { if (isset($parameters['action'])) { $action = $parameters['action']; if (!is_callable($action)) { - var_dump($action); + var_dump($action); throw new Exception('not a callable action'); } unset($parameters['action']); -- cgit v1.2.3 From 71918a820f0e5b7e9479711107db059cd3a3b194 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Tue, 31 Jul 2012 22:34:35 +0200 Subject: API: set request method for registered urls --- lib/api.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index 515bab6714e..203b07880fd 100644 --- a/lib/api.php +++ b/lib/api.php @@ -43,6 +43,7 @@ class OC_API { $name = str_replace(array('/', '{', '}'), '_', $name); if(!isset(self::$actions[$name])){ OC::$router->create($name, $url.'.{_format}') + ->method($method) ->defaults(array('_format' => 'xml')) ->requirements(array('_format' => 'xml|json')) ->action('OC_API', 'call'); -- cgit v1.2.3 From 7426217e760601f684c402bf363a51bb8c79947c Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Tue, 31 Jul 2012 23:26:15 +0200 Subject: Fix /privatedata/getattribute route --- lib/api.php | 10 ++++++---- ocs/routes.php | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index 203b07880fd..cf699f547f3 100644 --- a/lib/api.php +++ b/lib/api.php @@ -38,14 +38,16 @@ class OC_API { * @param callable $action the function to run * @param string $app the id of the app registering the call */ - public static function register($method, $url, $action, $app){ + public static function register($method, $url, $action, $app, + $defaults = array(), + $requirements = array()){ $name = strtolower($method).$url; $name = str_replace(array('/', '{', '}'), '_', $name); if(!isset(self::$actions[$name])){ OC::$router->create($name, $url.'.{_format}') ->method($method) - ->defaults(array('_format' => 'xml')) - ->requirements(array('_format' => 'xml|json')) + ->defaults(array('_format' => 'xml') + $defaults) + ->requirements(array('_format' => 'xml|json') + $requirements) ->action('OC_API', 'call'); self::$actions[$name] = array(); } @@ -112,7 +114,7 @@ class OC_API { private static function respond($response, $format='json'){ if ($format == 'json') { echo json_encode($response); - } else if ($format == 'xml') { + //} else if ($format == 'xml') { // TODO array to xml } else { var_dump($format, $response); diff --git a/ocs/routes.php b/ocs/routes.php index 95df0c7ec91..ac23e29af8a 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -12,6 +12,8 @@ OC_API::register('post', '/person/check', array('OC_OCS_Person', 'check'), 'ocs' // Activity OC_API::register('get', '/activity', array('OC_OCS_Activity', 'activityGet'), 'ocs'); // Privatedata +OC_API::register('get', '/privatedata/getattribute', array('OC_OCS_Privatedata', 'get'), 'ocs', array('app' => '', 'key' => '')); +OC_API::register('get', '/privatedata/getattribute/{app}', array('OC_OCS_Privatedata', 'get'), 'ocs', array('key' => '')); OC_API::register('get', '/privatedata/getattribute/{app}/{key}', array('OC_OCS_Privatedata', 'get'), 'ocs'); OC_API::register('post', '/privatedata/setattribute/{app}/{key}', array('OC_OCS_Privatedata', 'set'), 'ocs'); OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}', array('OC_OCS_Privatedata', 'delete'), 'ocs'); -- cgit v1.2.3 From e7f7693b2f28ad87c232db51f1101e720fb29623 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Wed, 1 Aug 2012 10:21:33 +0100 Subject: Fix 3rdparty paths, initialise OAuth in correct order --- lib/oauth.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/oauth.php b/lib/oauth.php index 09dbe4cc755..0c6e9af7252 100644 --- a/lib/oauth.php +++ b/lib/oauth.php @@ -37,12 +37,13 @@ class OC_OAuth { */ private static function init(){ // Include the libraries - require_once(OC::$THIRDPARTYROOT.'3rdparty/oauth-php/library/OAuthServer.php'); - require_once(OC::$THIRDPARTYROOT.'3rdparty/oauth-php/library/OAuthStore.php'); + require_once(OC::$THIRDPARTYROOT.'/3rdparty/oauth-php/library/OAuthServer.php'); + require_once(OC::$THIRDPARTYROOT.'/3rdparty/oauth-php/library/OAuthStore.php'); + require_once(OC::$THIRDPARTYROOT.'/3rdparty/oauth-php/library/OAuthRequestVerifier.php'); + // Initialise the OAuth store + self::$store = OAuthStore::instance('Session'); // Create the server object self::$server = new OAuthServer(); - // Initialise the OAuth store - self::$store = OAuthStore::instance('owncloud'); } /** @@ -109,6 +110,7 @@ class OC_OAuth { * @return string|int */ public static function isAuthorised(){ + self::init(); if(OAuthRequestVerifier::requestIsSigned()){ try{ $req = new OAuthRequestVerifier(); -- cgit v1.2.3 From e315384b4ddc207c1b3f142df4a57e8004a88966 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Wed, 1 Aug 2012 10:40:09 +0100 Subject: Remove unnecessary include --- lib/oauth.php | 1 - 1 file changed, 1 deletion(-) (limited to 'lib') diff --git a/lib/oauth.php b/lib/oauth.php index 0c6e9af7252..0621a72a72b 100644 --- a/lib/oauth.php +++ b/lib/oauth.php @@ -39,7 +39,6 @@ class OC_OAuth { // Include the libraries require_once(OC::$THIRDPARTYROOT.'/3rdparty/oauth-php/library/OAuthServer.php'); require_once(OC::$THIRDPARTYROOT.'/3rdparty/oauth-php/library/OAuthStore.php'); - require_once(OC::$THIRDPARTYROOT.'/3rdparty/oauth-php/library/OAuthRequestVerifier.php'); // Initialise the OAuth store self::$store = OAuthStore::instance('Session'); // Create the server object -- cgit v1.2.3 From 2afe5f9b2b59094b632e79e0a0fec0cd70509273 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Wed, 1 Aug 2012 13:37:00 +0000 Subject: API: add OC_API::checkLoggedIn() --- lib/api.php | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index cf699f547f3..a11dde1c6b8 100644 --- a/lib/api.php +++ b/lib/api.php @@ -121,4 +121,15 @@ class OC_API { } } + /** + * check if the user is authenticated + */ + public static function checkLoggedIn(){ + // Check OAuth + if(!OC_OAuth::isAuthorised()){ + OC_Response::setStatus(401); + die(); + } + } + } -- cgit v1.2.3 From c11c2d0fd46fbe2e74ff7fe2ff7205c5cb38ea9f Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Wed, 1 Aug 2012 13:39:05 +0000 Subject: Logout the user at the end of a call to be stateless --- lib/api.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index a11dde1c6b8..454a6fd26d3 100644 --- a/lib/api.php +++ b/lib/api.php @@ -77,6 +77,8 @@ class OC_API { } else { self::respond($response); } + // logout the user to be stateles + OC_User::logout(); } /** -- cgit v1.2.3 From 93daa9e247e9c423a6d4bb10af1106fdde37b800 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Wed, 1 Aug 2012 19:48:51 +0200 Subject: API: Complete respond function --- lib/api.php | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index 454a6fd26d3..6ee570d60e7 100644 --- a/lib/api.php +++ b/lib/api.php @@ -115,13 +115,32 @@ class OC_API { */ private static function respond($response, $format='json'){ if ($format == 'json') { - echo json_encode($response); - //} else if ($format == 'xml') { - // TODO array to xml + OC_JSON::encodedPrint($response); + } else if ($format == 'xml') { + header('Content-type: text/xml; charset=UTF-8'); + $writer = new XMLWriter(); + $writer->openMemory(); + $writer->setIndent( true ); + $writer->startDocument(); + self::toXML($response, $writer); + $writer->endDocument(); + echo $writer->outputMemory(true); } else { var_dump($format, $response); } } + + private static function toXML($array, $writer){ + foreach($array as $k => $v) { + if (is_array($v)) { + $writer->startElement($k); + self::toXML($v, $writer); + $writer->endElement(); + } else { + $writer->writeElement($k, $v); + } + } + } /** * check if the user is authenticated -- cgit v1.2.3 From 7952c6a31c27718428fddbca71c587506eb071d8 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Thu, 2 Aug 2012 17:47:38 +0200 Subject: Change access to router object to getter function --- lib/api.php | 2 +- lib/base.php | 18 ++++++++++++------ ocs/v1.php | 6 +++--- 3 files changed, 16 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index 6ee570d60e7..155082fa0d0 100644 --- a/lib/api.php +++ b/lib/api.php @@ -44,7 +44,7 @@ class OC_API { $name = strtolower($method).$url; $name = str_replace(array('/', '{', '}'), '_', $name); if(!isset(self::$actions[$name])){ - OC::$router->create($name, $url.'.{_format}') + OC::getRouter()->create($name, $url.'.{_format}') ->method($method) ->defaults(array('_format' => 'xml') + $defaults) ->requirements(array('_format' => 'xml|json') + $requirements) diff --git a/lib/base.php b/lib/base.php index 29a3502e352..43588944d04 100644 --- a/lib/base.php +++ b/lib/base.php @@ -62,14 +62,14 @@ class OC{ * requested file of app */ public static $REQUESTEDFILE = ''; - /* - * OC router - */ - public static $router = null; /** * check if owncloud runs in cli mode */ public static $CLI = false; + /* + * OC router + */ + protected static $router = null; /** * SPL autoload */ @@ -275,6 +275,14 @@ class OC{ } } + public static function getRouter() { + if (!isset(OC::$router)) { + OC::$router = new OC_Router(); + } + + return OC::$router; + } + public static function init(){ // register autoloader spl_autoload_register(array('OC','autoload')); @@ -358,8 +366,6 @@ class OC{ OC_User::useBackend(new OC_User_Database()); OC_Group::useBackend(new OC_Group_Database()); - OC::$router = new OC_Router(); - // Load Apps // This includes plugins for users and filesystems as well global $RUNTIME_NOAPPS; diff --git a/ocs/v1.php b/ocs/v1.php index 7cd61035e7c..cb8a1faf876 100644 --- a/ocs/v1.php +++ b/ocs/v1.php @@ -25,11 +25,11 @@ require_once('../lib/base.php'); use Symfony\Component\Routing\Exception\ResourceNotFoundException; use Symfony\Component\Routing\Exception\MethodNotAllowedException; -OC::$router->useCollection('ocs'); -OC::$router->loadRoutes(); +OC::getRouter()->useCollection('ocs'); +OC::getRouter()->loadRoutes(); try { - OC::$router->match($_SERVER['PATH_INFO']); + OC::getRouter()->match($_SERVER['PATH_INFO']); } catch (ResourceNotFoundException $e) { OC_OCS::notFound(); } catch (MethodNotAllowedException $e) { -- cgit v1.2.3 From 37ef522b057caf0a0058f6be87db39f7a4f1e174 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Thu, 2 Aug 2012 17:48:09 +0200 Subject: Quick fix for xml encoding arrays --- lib/api.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index 155082fa0d0..1ef4e090e37 100644 --- a/lib/api.php +++ b/lib/api.php @@ -132,6 +132,9 @@ class OC_API { private static function toXML($array, $writer){ foreach($array as $k => $v) { + if (is_numeric($k)) { + $k = 'element'; + } if (is_array($v)) { $writer->startElement($k); self::toXML($v, $writer); -- cgit v1.2.3 From 6ba2623485655460440a972e34a8a2a2fda02821 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Thu, 2 Aug 2012 17:59:18 +0200 Subject: Move loading of routes to OC::getRouter function --- lib/base.php | 1 + lib/router.php | 7 ++++++- ocs/v1.php | 1 - 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/base.php b/lib/base.php index 43588944d04..0d9ececc0c9 100644 --- a/lib/base.php +++ b/lib/base.php @@ -278,6 +278,7 @@ class OC{ public static function getRouter() { if (!isset(OC::$router)) { OC::$router = new OC_Router(); + OC::$router->loadRoutes(); } return OC::$router; diff --git a/lib/router.php b/lib/router.php index c3864cfc91c..5c5171cf82d 100644 --- a/lib/router.php +++ b/lib/router.php @@ -16,10 +16,15 @@ class OC_Router { protected $collections = array(); protected $collection = null; + public function __construct() { + // TODO cache + $this->loadRoutes(); + } + /** * loads the api routes */ - public function loadRoutes(){ + public function loadRoutes() { // TODO cache foreach(OC_APP::getEnabledApps() as $app){ $file = OC_App::getAppPath($app).'/appinfo/routes.php'; diff --git a/ocs/v1.php b/ocs/v1.php index cb8a1faf876..938a57009f7 100644 --- a/ocs/v1.php +++ b/ocs/v1.php @@ -26,7 +26,6 @@ use Symfony\Component\Routing\Exception\ResourceNotFoundException; use Symfony\Component\Routing\Exception\MethodNotAllowedException; OC::getRouter()->useCollection('ocs'); -OC::getRouter()->loadRoutes(); try { OC::getRouter()->match($_SERVER['PATH_INFO']); -- cgit v1.2.3 From 4b9200f6f7a571c251ef89599e1af9e25e2e75f4 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Thu, 2 Aug 2012 21:51:31 +0200 Subject: Routing: combine all routes into one set --- lib/api.php | 1 + lib/router.php | 22 ++++++++++++++-------- ocs/v1.php | 4 +--- 3 files changed, 16 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index 1ef4e090e37..05d34ffe870 100644 --- a/lib/api.php +++ b/lib/api.php @@ -44,6 +44,7 @@ class OC_API { $name = strtolower($method).$url; $name = str_replace(array('/', '{', '}'), '_', $name); if(!isset(self::$actions[$name])){ + OC::getRouter()->useCollection('ocs'); OC::getRouter()->create($name, $url.'.{_format}') ->method($method) ->defaults(array('_format' => 'xml') + $defaults) diff --git a/lib/router.php b/lib/router.php index 5c5171cf82d..12cd55df414 100644 --- a/lib/router.php +++ b/lib/router.php @@ -15,32 +15,38 @@ use Symfony\Component\Routing\Exception\ResourceNotFoundException; class OC_Router { protected $collections = array(); protected $collection = null; - - public function __construct() { - // TODO cache - $this->loadRoutes(); - } + protected $root = null; /** * loads the api routes */ public function loadRoutes() { // TODO cache + $this->root = $this->getCollection('root'); foreach(OC_APP::getEnabledApps() as $app){ $file = OC_App::getAppPath($app).'/appinfo/routes.php'; if(file_exists($file)){ + $this->useCollection($app); require_once($file); + $collection = $this->getCollection($app); + $this->root->addCollection($collection, '/apps/'.$app); } } // include ocs routes require_once(OC::$SERVERROOT.'/ocs/routes.php'); + $collection = $this->getCollection('ocs'); + $this->root->addCollection($collection, '/ocs'); } - public function useCollection($name) { + protected function getCollection($name) { if (!isset($this->collections[$name])) { $this->collections[$name] = new RouteCollection(); } - $this->collection = $this->collections[$name]; + return $this->collections[$name]; + } + + public function useCollection($name) { + $this->collection = $this->getCollection($name); } public function create($name, $pattern, array $defaults = array(), array $requirements = array()) { @@ -51,7 +57,7 @@ class OC_Router { public function match($url) { $context = new RequestContext($_SERVER['REQUEST_URI'], $_SERVER['REQUEST_METHOD']); - $matcher = new UrlMatcher($this->collection, $context); + $matcher = new UrlMatcher($this->root, $context); $parameters = $matcher->match($url); if (isset($parameters['action'])) { $action = $parameters['action']; diff --git a/ocs/v1.php b/ocs/v1.php index 938a57009f7..ce6bad3d450 100644 --- a/ocs/v1.php +++ b/ocs/v1.php @@ -25,10 +25,8 @@ require_once('../lib/base.php'); use Symfony\Component\Routing\Exception\ResourceNotFoundException; use Symfony\Component\Routing\Exception\MethodNotAllowedException; -OC::getRouter()->useCollection('ocs'); - try { - OC::getRouter()->match($_SERVER['PATH_INFO']); + OC::getRouter()->match('/ocs'.$_SERVER['PATH_INFO']); } catch (ResourceNotFoundException $e) { OC_OCS::notFound(); } catch (MethodNotAllowedException $e) { -- cgit v1.2.3 From e3d88270cc0fcdfc667f0a120040864818b3b2a1 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Thu, 2 Aug 2012 20:02:31 -0400 Subject: OAuth server implementation using oauth library --- 3rdparty/OAuth/LICENSE.TXT | 21 ++ 3rdparty/OAuth/OAuth.php | 895 +++++++++++++++++++++++++++++++++++++++++++++ lib/api.php | 11 +- lib/oauth.php | 136 ++----- settings/oauth.php | 23 +- 5 files changed, 980 insertions(+), 106 deletions(-) create mode 100644 3rdparty/OAuth/LICENSE.TXT create mode 100644 3rdparty/OAuth/OAuth.php (limited to 'lib') diff --git a/3rdparty/OAuth/LICENSE.TXT b/3rdparty/OAuth/LICENSE.TXT new file mode 100644 index 00000000000..8891c7ddc90 --- /dev/null +++ b/3rdparty/OAuth/LICENSE.TXT @@ -0,0 +1,21 @@ +The MIT License + +Copyright (c) 2007 Andy Smith + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/3rdparty/OAuth/OAuth.php b/3rdparty/OAuth/OAuth.php new file mode 100644 index 00000000000..64b7007ab9d --- /dev/null +++ b/3rdparty/OAuth/OAuth.php @@ -0,0 +1,895 @@ +key = $key; + $this->secret = $secret; + $this->callback_url = $callback_url; + } + + function __toString() { + return "OAuthConsumer[key=$this->key,secret=$this->secret]"; + } +} + +class OAuthToken { + // access tokens and request tokens + public $key; + public $secret; + + /** + * key = the token + * secret = the token secret + */ + function __construct($key, $secret) { + $this->key = $key; + $this->secret = $secret; + } + + /** + * generates the basic string serialization of a token that a server + * would respond to request_token and access_token calls with + */ + function to_string() { + return "oauth_token=" . + OAuthUtil::urlencode_rfc3986($this->key) . + "&oauth_token_secret=" . + OAuthUtil::urlencode_rfc3986($this->secret); + } + + function __toString() { + return $this->to_string(); + } +} + +/** + * A class for implementing a Signature Method + * See section 9 ("Signing Requests") in the spec + */ +abstract class OAuthSignatureMethod { + /** + * Needs to return the name of the Signature Method (ie HMAC-SHA1) + * @return string + */ + abstract public function get_name(); + + /** + * Build up the signature + * NOTE: The output of this function MUST NOT be urlencoded. + * the encoding is handled in OAuthRequest when the final + * request is serialized + * @param OAuthRequest $request + * @param OAuthConsumer $consumer + * @param OAuthToken $token + * @return string + */ + abstract public function build_signature($request, $consumer, $token); + + /** + * Verifies that a given signature is correct + * @param OAuthRequest $request + * @param OAuthConsumer $consumer + * @param OAuthToken $token + * @param string $signature + * @return bool + */ + public function check_signature($request, $consumer, $token, $signature) { + $built = $this->build_signature($request, $consumer, $token); + + // Check for zero length, although unlikely here + if (strlen($built) == 0 || strlen($signature) == 0) { + return false; + } + + if (strlen($built) != strlen($signature)) { + return false; + } + + // Avoid a timing leak with a (hopefully) time insensitive compare + $result = 0; + for ($i = 0; $i < strlen($signature); $i++) { + $result |= ord($built{$i}) ^ ord($signature{$i}); + } + + return $result == 0; + } +} + +/** + * The HMAC-SHA1 signature method uses the HMAC-SHA1 signature algorithm as defined in [RFC2104] + * where the Signature Base String is the text and the key is the concatenated values (each first + * encoded per Parameter Encoding) of the Consumer Secret and Token Secret, separated by an '&' + * character (ASCII code 38) even if empty. + * - Chapter 9.2 ("HMAC-SHA1") + */ +class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod { + function get_name() { + return "HMAC-SHA1"; + } + + public function build_signature($request, $consumer, $token) { + $base_string = $request->get_signature_base_string(); + $request->base_string = $base_string; + + $key_parts = array( + $consumer->secret, + ($token) ? $token->secret : "" + ); + + $key_parts = OAuthUtil::urlencode_rfc3986($key_parts); + $key = implode('&', $key_parts); + + return base64_encode(hash_hmac('sha1', $base_string, $key, true)); + } +} + +/** + * The PLAINTEXT method does not provide any security protection and SHOULD only be used + * over a secure channel such as HTTPS. It does not use the Signature Base String. + * - Chapter 9.4 ("PLAINTEXT") + */ +class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod { + public function get_name() { + return "PLAINTEXT"; + } + + /** + * oauth_signature is set to the concatenated encoded values of the Consumer Secret and + * Token Secret, separated by a '&' character (ASCII code 38), even if either secret is + * empty. The result MUST be encoded again. + * - Chapter 9.4.1 ("Generating Signatures") + * + * Please note that the second encoding MUST NOT happen in the SignatureMethod, as + * OAuthRequest handles this! + */ + public function build_signature($request, $consumer, $token) { + $key_parts = array( + $consumer->secret, + ($token) ? $token->secret : "" + ); + + $key_parts = OAuthUtil::urlencode_rfc3986($key_parts); + $key = implode('&', $key_parts); + $request->base_string = $key; + + return $key; + } +} + +/** + * The RSA-SHA1 signature method uses the RSASSA-PKCS1-v1_5 signature algorithm as defined in + * [RFC3447] section 8.2 (more simply known as PKCS#1), using SHA-1 as the hash function for + * EMSA-PKCS1-v1_5. It is assumed that the Consumer has provided its RSA public key in a + * verified way to the Service Provider, in a manner which is beyond the scope of this + * specification. + * - Chapter 9.3 ("RSA-SHA1") + */ +abstract class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod { + public function get_name() { + return "RSA-SHA1"; + } + + // Up to the SP to implement this lookup of keys. Possible ideas are: + // (1) do a lookup in a table of trusted certs keyed off of consumer + // (2) fetch via http using a url provided by the requester + // (3) some sort of specific discovery code based on request + // + // Either way should return a string representation of the certificate + protected abstract function fetch_public_cert(&$request); + + // Up to the SP to implement this lookup of keys. Possible ideas are: + // (1) do a lookup in a table of trusted certs keyed off of consumer + // + // Either way should return a string representation of the certificate + protected abstract function fetch_private_cert(&$request); + + public function build_signature($request, $consumer, $token) { + $base_string = $request->get_signature_base_string(); + $request->base_string = $base_string; + + // Fetch the private key cert based on the request + $cert = $this->fetch_private_cert($request); + + // Pull the private key ID from the certificate + $privatekeyid = openssl_get_privatekey($cert); + + // Sign using the key + $ok = openssl_sign($base_string, $signature, $privatekeyid); + + // Release the key resource + openssl_free_key($privatekeyid); + + return base64_encode($signature); + } + + public function check_signature($request, $consumer, $token, $signature) { + $decoded_sig = base64_decode($signature); + + $base_string = $request->get_signature_base_string(); + + // Fetch the public key cert based on the request + $cert = $this->fetch_public_cert($request); + + // Pull the public key ID from the certificate + $publickeyid = openssl_get_publickey($cert); + + // Check the computed signature against the one passed in the query + $ok = openssl_verify($base_string, $decoded_sig, $publickeyid); + + // Release the key resource + openssl_free_key($publickeyid); + + return $ok == 1; + } +} + +class OAuthRequest { + protected $parameters; + protected $http_method; + protected $http_url; + // for debug purposes + public $base_string; + public static $version = '1.0'; + public static $POST_INPUT = 'php://input'; + + function __construct($http_method, $http_url, $parameters=NULL) { + $parameters = ($parameters) ? $parameters : array(); + $parameters = array_merge( OAuthUtil::parse_parameters(parse_url($http_url, PHP_URL_QUERY)), $parameters); + $this->parameters = $parameters; + $this->http_method = $http_method; + $this->http_url = $http_url; + } + + + /** + * attempt to build up a request from what was passed to the server + */ + public static function from_request($http_method=NULL, $http_url=NULL, $parameters=NULL) { + $scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on") + ? 'http' + : 'https'; + $http_url = ($http_url) ? $http_url : $scheme . + '://' . $_SERVER['SERVER_NAME'] . + ':' . + $_SERVER['SERVER_PORT'] . + $_SERVER['REQUEST_URI']; + $http_method = ($http_method) ? $http_method : $_SERVER['REQUEST_METHOD']; + + // We weren't handed any parameters, so let's find the ones relevant to + // this request. + // If you run XML-RPC or similar you should use this to provide your own + // parsed parameter-list + if (!$parameters) { + // Find request headers + $request_headers = OAuthUtil::get_headers(); + + // Parse the query-string to find GET parameters + $parameters = OAuthUtil::parse_parameters($_SERVER['QUERY_STRING']); + + // It's a POST request of the proper content-type, so parse POST + // parameters and add those overriding any duplicates from GET + if ($http_method == "POST" + && isset($request_headers['Content-Type']) + && strstr($request_headers['Content-Type'], + 'application/x-www-form-urlencoded') + ) { + $post_data = OAuthUtil::parse_parameters( + file_get_contents(self::$POST_INPUT) + ); + $parameters = array_merge($parameters, $post_data); + } + + // We have a Authorization-header with OAuth data. Parse the header + // and add those overriding any duplicates from GET or POST + if (isset($request_headers['Authorization']) && substr($request_headers['Authorization'], 0, 6) == 'OAuth ') { + $header_parameters = OAuthUtil::split_header( + $request_headers['Authorization'] + ); + $parameters = array_merge($parameters, $header_parameters); + } + + } + + return new OAuthRequest($http_method, $http_url, $parameters); + } + + /** + * pretty much a helper function to set up the request + */ + public static function from_consumer_and_token($consumer, $token, $http_method, $http_url, $parameters=NULL) { + $parameters = ($parameters) ? $parameters : array(); + $defaults = array("oauth_version" => OAuthRequest::$version, + "oauth_nonce" => OAuthRequest::generate_nonce(), + "oauth_timestamp" => OAuthRequest::generate_timestamp(), + "oauth_consumer_key" => $consumer->key); + if ($token) + $defaults['oauth_token'] = $token->key; + + $parameters = array_merge($defaults, $parameters); + + return new OAuthRequest($http_method, $http_url, $parameters); + } + + public function set_parameter($name, $value, $allow_duplicates = true) { + if ($allow_duplicates && isset($this->parameters[$name])) { + // We have already added parameter(s) with this name, so add to the list + if (is_scalar($this->parameters[$name])) { + // This is the first duplicate, so transform scalar (string) + // into an array so we can add the duplicates + $this->parameters[$name] = array($this->parameters[$name]); + } + + $this->parameters[$name][] = $value; + } else { + $this->parameters[$name] = $value; + } + } + + public function get_parameter($name) { + return isset($this->parameters[$name]) ? $this->parameters[$name] : null; + } + + public function get_parameters() { + return $this->parameters; + } + + public function unset_parameter($name) { + unset($this->parameters[$name]); + } + + /** + * The request parameters, sorted and concatenated into a normalized string. + * @return string + */ + public function get_signable_parameters() { + // Grab all parameters + $params = $this->parameters; + + // Remove oauth_signature if present + // Ref: Spec: 9.1.1 ("The oauth_signature parameter MUST be excluded.") + if (isset($params['oauth_signature'])) { + unset($params['oauth_signature']); + } + + return OAuthUtil::build_http_query($params); + } + + /** + * Returns the base string of this request + * + * The base string defined as the method, the url + * and the parameters (normalized), each urlencoded + * and the concated with &. + */ + public function get_signature_base_string() { + $parts = array( + $this->get_normalized_http_method(), + $this->get_normalized_http_url(), + $this->get_signable_parameters() + ); + + $parts = OAuthUtil::urlencode_rfc3986($parts); + + return implode('&', $parts); + } + + /** + * just uppercases the http method + */ + public function get_normalized_http_method() { + return strtoupper($this->http_method); + } + + /** + * parses the url and rebuilds it to be + * scheme://host/path + */ + public function get_normalized_http_url() { + $parts = parse_url($this->http_url); + + $scheme = (isset($parts['scheme'])) ? $parts['scheme'] : 'http'; + $port = (isset($parts['port'])) ? $parts['port'] : (($scheme == 'https') ? '443' : '80'); + $host = (isset($parts['host'])) ? strtolower($parts['host']) : ''; + $path = (isset($parts['path'])) ? $parts['path'] : ''; + + if (($scheme == 'https' && $port != '443') + || ($scheme == 'http' && $port != '80')) { + $host = "$host:$port"; + } + return "$scheme://$host$path"; + } + + /** + * builds a url usable for a GET request + */ + public function to_url() { + $post_data = $this->to_postdata(); + $out = $this->get_normalized_http_url(); + if ($post_data) { + $out .= '?'.$post_data; + } + return $out; + } + + /** + * builds the data one would send in a POST request + */ + public function to_postdata() { + return OAuthUtil::build_http_query($this->parameters); + } + + /** + * builds the Authorization: header + */ + public function to_header($realm=null) { + $first = true; + if($realm) { + $out = 'Authorization: OAuth realm="' . OAuthUtil::urlencode_rfc3986($realm) . '"'; + $first = false; + } else + $out = 'Authorization: OAuth'; + + $total = array(); + foreach ($this->parameters as $k => $v) { + if (substr($k, 0, 5) != "oauth") continue; + if (is_array($v)) { + throw new OAuthException('Arrays not supported in headers'); + } + $out .= ($first) ? ' ' : ','; + $out .= OAuthUtil::urlencode_rfc3986($k) . + '="' . + OAuthUtil::urlencode_rfc3986($v) . + '"'; + $first = false; + } + return $out; + } + + public function __toString() { + return $this->to_url(); + } + + + public function sign_request($signature_method, $consumer, $token) { + $this->set_parameter( + "oauth_signature_method", + $signature_method->get_name(), + false + ); + $signature = $this->build_signature($signature_method, $consumer, $token); + $this->set_parameter("oauth_signature", $signature, false); + } + + public function build_signature($signature_method, $consumer, $token) { + $signature = $signature_method->build_signature($this, $consumer, $token); + return $signature; + } + + /** + * util function: current timestamp + */ + private static function generate_timestamp() { + return time(); + } + + /** + * util function: current nonce + */ + private static function generate_nonce() { + $mt = microtime(); + $rand = mt_rand(); + + return md5($mt . $rand); // md5s look nicer than numbers + } +} + +class OAuthServer { + protected $timestamp_threshold = 300; // in seconds, five minutes + protected $version = '1.0'; // hi blaine + protected $signature_methods = array(); + + protected $data_store; + + function __construct($data_store) { + $this->data_store = $data_store; + } + + public function add_signature_method($signature_method) { + $this->signature_methods[$signature_method->get_name()] = + $signature_method; + } + + // high level functions + + /** + * process a request_token request + * returns the request token on success + */ + public function fetch_request_token(&$request) { + $this->get_version($request); + + $consumer = $this->get_consumer($request); + + // no token required for the initial token request + $token = NULL; + + $this->check_signature($request, $consumer, $token); + + // Rev A change + $callback = $request->get_parameter('oauth_callback'); + $new_token = $this->data_store->new_request_token($consumer, $callback); + + return $new_token; + } + + /** + * process an access_token request + * returns the access token on success + */ + public function fetch_access_token(&$request) { + $this->get_version($request); + + $consumer = $this->get_consumer($request); + + // requires authorized request token + $token = $this->get_token($request, $consumer, "request"); + + $this->check_signature($request, $consumer, $token); + + // Rev A change + $verifier = $request->get_parameter('oauth_verifier'); + $new_token = $this->data_store->new_access_token($token, $consumer, $verifier); + + return $new_token; + } + + /** + * verify an api call, checks all the parameters + */ + public function verify_request(&$request) { + $this->get_version($request); + $consumer = $this->get_consumer($request); + $token = $this->get_token($request, $consumer, "access"); + $this->check_signature($request, $consumer, $token); + return array($consumer, $token); + } + + // Internals from here + /** + * version 1 + */ + private function get_version(&$request) { + $version = $request->get_parameter("oauth_version"); + if (!$version) { + // Service Providers MUST assume the protocol version to be 1.0 if this parameter is not present. + // Chapter 7.0 ("Accessing Protected Ressources") + $version = '1.0'; + } + if ($version !== $this->version) { + throw new OAuthException("OAuth version '$version' not supported"); + } + return $version; + } + + /** + * figure out the signature with some defaults + */ + private function get_signature_method($request) { + $signature_method = $request instanceof OAuthRequest + ? $request->get_parameter("oauth_signature_method") + : NULL; + + if (!$signature_method) { + // According to chapter 7 ("Accessing Protected Ressources") the signature-method + // parameter is required, and we can't just fallback to PLAINTEXT + throw new OAuthException('No signature method parameter. This parameter is required'); + } + + if (!in_array($signature_method, + array_keys($this->signature_methods))) { + throw new OAuthException( + "Signature method '$signature_method' not supported " . + "try one of the following: " . + implode(", ", array_keys($this->signature_methods)) + ); + } + return $this->signature_methods[$signature_method]; + } + + /** + * try to find the consumer for the provided request's consumer key + */ + private function get_consumer($request) { + $consumer_key = $request instanceof OAuthRequest + ? $request->get_parameter("oauth_consumer_key") + : NULL; + + if (!$consumer_key) { + throw new OAuthException("Invalid consumer key"); + } + + $consumer = $this->data_store->lookup_consumer($consumer_key); + if (!$consumer) { + throw new OAuthException("Invalid consumer"); + } + + return $consumer; + } + + /** + * try to find the token for the provided request's token key + */ + private function get_token($request, $consumer, $token_type="access") { + $token_field = $request instanceof OAuthRequest + ? $request->get_parameter('oauth_token') + : NULL; + + $token = $this->data_store->lookup_token( + $consumer, $token_type, $token_field + ); + if (!$token) { + throw new OAuthException("Invalid $token_type token: $token_field"); + } + return $token; + } + + /** + * all-in-one function to check the signature on a request + * should guess the signature method appropriately + */ + private function check_signature($request, $consumer, $token) { + // this should probably be in a different method + $timestamp = $request instanceof OAuthRequest + ? $request->get_parameter('oauth_timestamp') + : NULL; + $nonce = $request instanceof OAuthRequest + ? $request->get_parameter('oauth_nonce') + : NULL; + + $this->check_timestamp($timestamp); + $this->check_nonce($consumer, $token, $nonce, $timestamp); + + $signature_method = $this->get_signature_method($request); + + $signature = $request->get_parameter('oauth_signature'); + $valid_sig = $signature_method->check_signature( + $request, + $consumer, + $token, + $signature + ); + + if (!$valid_sig) { + throw new OAuthException("Invalid signature"); + } + } + + /** + * check that the timestamp is new enough + */ + private function check_timestamp($timestamp) { + if( ! $timestamp ) + throw new OAuthException( + 'Missing timestamp parameter. The parameter is required' + ); + + // verify that timestamp is recentish + $now = time(); + if (abs($now - $timestamp) > $this->timestamp_threshold) { + throw new OAuthException( + "Expired timestamp, yours $timestamp, ours $now" + ); + } + } + + /** + * check that the nonce is not repeated + */ + private function check_nonce($consumer, $token, $nonce, $timestamp) { + if( ! $nonce ) + throw new OAuthException( + 'Missing nonce parameter. The parameter is required' + ); + + // verify that the nonce is uniqueish + $found = $this->data_store->lookup_nonce( + $consumer, + $token, + $nonce, + $timestamp + ); + if ($found) { + throw new OAuthException("Nonce already used: $nonce"); + } + } + +} + +class OAuthDataStore { + function lookup_consumer($consumer_key) { + // implement me + } + + function lookup_token($consumer, $token_type, $token) { + // implement me + } + + function lookup_nonce($consumer, $token, $nonce, $timestamp) { + // implement me + } + + function new_request_token($consumer, $callback = null) { + // return a new token attached to this consumer + } + + function new_access_token($token, $consumer, $verifier = null) { + // return a new access token attached to this consumer + // for the user associated with this token if the request token + // is authorized + // should also invalidate the request token + } + +} + +class OAuthUtil { + public static function urlencode_rfc3986($input) { + if (is_array($input)) { + return array_map(array('OAuthUtil', 'urlencode_rfc3986'), $input); + } else if (is_scalar($input)) { + return str_replace( + '+', + ' ', + str_replace('%7E', '~', rawurlencode($input)) + ); + } else { + return ''; + } +} + + + // This decode function isn't taking into consideration the above + // modifications to the encoding process. However, this method doesn't + // seem to be used anywhere so leaving it as is. + public static function urldecode_rfc3986($string) { + return urldecode($string); + } + + // Utility function for turning the Authorization: header into + // parameters, has to do some unescaping + // Can filter out any non-oauth parameters if needed (default behaviour) + // May 28th, 2010 - method updated to tjerk.meesters for a speed improvement. + // see http://code.google.com/p/oauth/issues/detail?id=163 + public static function split_header($header, $only_allow_oauth_parameters = true) { + $params = array(); + if (preg_match_all('/('.($only_allow_oauth_parameters ? 'oauth_' : '').'[a-z_-]*)=(:?"([^"]*)"|([^,]*))/', $header, $matches)) { + foreach ($matches[1] as $i => $h) { + $params[$h] = OAuthUtil::urldecode_rfc3986(empty($matches[3][$i]) ? $matches[4][$i] : $matches[3][$i]); + } + if (isset($params['realm'])) { + unset($params['realm']); + } + } + return $params; + } + + // helper to try to sort out headers for people who aren't running apache + public static function get_headers() { + if (function_exists('apache_request_headers')) { + // we need this to get the actual Authorization: header + // because apache tends to tell us it doesn't exist + $headers = apache_request_headers(); + + // sanitize the output of apache_request_headers because + // we always want the keys to be Cased-Like-This and arh() + // returns the headers in the same case as they are in the + // request + $out = array(); + foreach ($headers AS $key => $value) { + $key = str_replace( + " ", + "-", + ucwords(strtolower(str_replace("-", " ", $key))) + ); + $out[$key] = $value; + } + } else { + // otherwise we don't have apache and are just going to have to hope + // that $_SERVER actually contains what we need + $out = array(); + if( isset($_SERVER['CONTENT_TYPE']) ) + $out['Content-Type'] = $_SERVER['CONTENT_TYPE']; + if( isset($_ENV['CONTENT_TYPE']) ) + $out['Content-Type'] = $_ENV['CONTENT_TYPE']; + + foreach ($_SERVER as $key => $value) { + if (substr($key, 0, 5) == "HTTP_") { + // this is chaos, basically it is just there to capitalize the first + // letter of every word that is not an initial HTTP and strip HTTP + // code from przemek + $key = str_replace( + " ", + "-", + ucwords(strtolower(str_replace("_", " ", substr($key, 5)))) + ); + $out[$key] = $value; + } + } + } + return $out; + } + + // This function takes a input like a=b&a=c&d=e and returns the parsed + // parameters like this + // array('a' => array('b','c'), 'd' => 'e') + public static function parse_parameters( $input ) { + if (!isset($input) || !$input) return array(); + + $pairs = explode('&', $input); + + $parsed_parameters = array(); + foreach ($pairs as $pair) { + $split = explode('=', $pair, 2); + $parameter = OAuthUtil::urldecode_rfc3986($split[0]); + $value = isset($split[1]) ? OAuthUtil::urldecode_rfc3986($split[1]) : ''; + + if (isset($parsed_parameters[$parameter])) { + // We have already recieved parameter(s) with this name, so add to the list + // of parameters with this name + + if (is_scalar($parsed_parameters[$parameter])) { + // This is the first duplicate, so transform scalar (string) into an array + // so we can add the duplicates + $parsed_parameters[$parameter] = array($parsed_parameters[$parameter]); + } + + $parsed_parameters[$parameter][] = $value; + } else { + $parsed_parameters[$parameter] = $value; + } + } + return $parsed_parameters; + } + + public static function build_http_query($params) { + if (!$params) return ''; + + // Urlencode both keys and values + $keys = OAuthUtil::urlencode_rfc3986(array_keys($params)); + $values = OAuthUtil::urlencode_rfc3986(array_values($params)); + $params = array_combine($keys, $values); + + // Parameters are sorted by name, using lexicographical byte value ordering. + // Ref: Spec: 9.1.1 (1) + uksort($params, 'strcmp'); + + $pairs = array(); + foreach ($params as $parameter => $value) { + if (is_array($value)) { + // If two or more parameters share the same name, they are sorted by their value + // Ref: Spec: 9.1.1 (1) + // June 12th, 2010 - changed to sort because of issue 164 by hidetaka + sort($value, SORT_STRING); + foreach ($value as $duplicate_value) { + $pairs[] = $parameter . '=' . $duplicate_value; + } + } else { + $pairs[] = $parameter . '=' . $value; + } + } + // For each parameter, the name is separated from the corresponding value by an '=' character (ASCII code 61) + // Each name-value pair is separated by an '&' character (ASCII code 38) + return implode('&', $pairs); + } +} + +?> \ No newline at end of file diff --git a/lib/api.php b/lib/api.php index 05d34ffe870..c8bd0aec2fa 100644 --- a/lib/api.php +++ b/lib/api.php @@ -25,6 +25,15 @@ */ class OC_API { + + private static $server; + + /** + * initialises the OAuth store and server + */ + private static function init() { + self::$server = new OC_OAuthServer(new OC_OAuthStore()); + } /** * api actions @@ -151,7 +160,7 @@ class OC_API { */ public static function checkLoggedIn(){ // Check OAuth - if(!OC_OAuth::isAuthorised()){ + if(!OC_OAuthServer::isAuthorised()){ OC_Response::setStatus(401); die(); } diff --git a/lib/oauth.php b/lib/oauth.php index 0621a72a72b..b72d9aab446 100644 --- a/lib/oauth.php +++ b/lib/oauth.php @@ -2,8 +2,10 @@ /** * ownCloud * -* @author Tom Needham -* @copyright 2012 Tom Needham tom@owncloud.com +* @author Tom Needham +* @author Michael Gapczynski +* @copyright 2012 Tom Needham tom@owncloud.com +* @copyright 2012 Michael Gapczynski mtgap@owncloud.com * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -20,87 +22,25 @@ * */ -class OC_OAuth { - - /** - * the oauth-php server object - */ - private static $server; - - /** - * the oauth-php oauthstore object - */ - private static $store; - - /** - * initialises the OAuth store and server - */ - private static function init(){ - // Include the libraries - require_once(OC::$THIRDPARTYROOT.'/3rdparty/oauth-php/library/OAuthServer.php'); - require_once(OC::$THIRDPARTYROOT.'/3rdparty/oauth-php/library/OAuthStore.php'); - // Initialise the OAuth store - self::$store = OAuthStore::instance('Session'); - // Create the server object - self::$server = new OAuthServer(); - } - - /** - * gets a request token - * TODO save the scopes in the database with this token - */ - public static function getRequestToken(){ - self::init(); - self::$server->requestToken(); - } - - /** - * get the scopes requested by this token - * @param string $requesttoken - * @return array scopes - */ - public static function getScopes($requesttoken){ - // TODO - } - - /** - * exchanges authorised request token for access token - */ - public static function getAccessToken(){ - self::init(); - self::$server->accessToken(); - } - - /** - * registers a new consumer - * @param array $details consumer details, keys requester_name and requester_email required - * @param string $user the owncloud user adding the consumer - * @return array the consumers details including secret and key - */ - public static function registerConsumer($details, $user){ - self::init(); - $consumer = self::$store->updateConsumer($details, $user, OC_Group::inGroup($user, 'admin')); - return $consumer; - } - - /** - * gets a list of consumers - * @param string $user - */ - public static function getConsumers($user=null){ - $user = is_null($user) ? OC_User::getUser() : $user; - return self::$store->listConsumers($user); +class OC_OAuthServer extends OAuthServer { + + public function fetch_request_token(&$request) { + $this->get_version($request); + $consumer = $this->get_consumer($request); + $this->check_signature($request, $consumer, null); + $callback = $request->get_parameter('oauth_callback'); + $scope = $request->get_parameter('scope'); + // TODO Validate scopes + return $this->data_store->new_request_token($consumer, $scope, $callback); } - /** - * authorises a request token - redirects to callback - * @param string $user - * @param bool $authorised - */ - public static function authoriseToken($user=null){ - $user = is_null($user) ? OC_User::getUser() : $user; - self::$server->authorizeVerify(); - self::$server->authorize($authorised, $user); + public function authoriseRequestToken(&$request) { + $this->get_version($request); + $consumer = $this->get_consumer($request); + $this->check_signature($request, $consumer, null); + $token = $this->get_token($request, $consumer, 'request'); + $this->check_signature($request, $consumer, $token); + return $this->data_store->authorise_request_token($token, $consumer, OC_User::getUser()); } /** @@ -108,28 +48,22 @@ class OC_OAuth { * TODO distinguish between failures as one is a 400 error and other is 401 * @return string|int */ - public static function isAuthorised(){ - self::init(); - if(OAuthRequestVerifier::requestIsSigned()){ - try{ - $req = new OAuthRequestVerifier(); - $user = $req->verify(); - $run = true; - OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $user )); - if(!$run){ - return false; - } - OC_User::setUserId($user); - OC_Hook::emit( "OC_User", "post_login", array( "uid" => $user )); - return $user; - } catch(OAuthException $e) { - // 401 Unauthorised - return false; - } - } else { - // Bad request + public static function isAuthorised($scope) { + try { + $request = OAuthRequest::from_request(); + $this->verify_request(); + } catch (OAuthException $exception) { return false; } + // TODO Get user out of token? May have to write own verify_request() +// $run = true; +// OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $user )); +// if(!$run){ +// return false; +// } +// OC_User::setUserId($user); +// OC_Hook::emit( "OC_User", "post_login", array( "uid" => $user )); +// return $user; } } \ No newline at end of file diff --git a/settings/oauth.php b/settings/oauth.php index 2592b926d17..9e7a3c04935 100644 --- a/settings/oauth.php +++ b/settings/oauth.php @@ -9,6 +9,7 @@ require_once('../lib/base.php'); // Logic $operation = isset($_GET['operation']) ? $_GET['operation'] : ''; +$server = new OC_OAuthServer(new OC_OAuthStore()); switch($operation){ case 'register': @@ -16,8 +17,15 @@ switch($operation){ break; case 'request_token': - break; - + try { + $request = OAuthRequest::from_request(); + $token = $server->fetch_request_token($request); + echo $token; + } catch (OAuthException $exception) { + OC_Log::write('OC_OAuthServer', $exception->getMessage(), OC_LOG::ERROR); + echo $exception->getMessage(); + } + break; case 'authorise'; OC_Util::checkLoggedIn(); // Example @@ -56,8 +64,15 @@ switch($operation){ break; case 'access_token'; - break; - + try { + $request = OAuthRequest::from_request(); + $token = $server->fetch_access_token($request); + echo $token; + } catch (OAuthException $exception) { + OC_Log::write('OC_OAuthServer', $exception->getMessage(), OC_LOG::ERROR); + echo $exception->getMessage(); + } + break; default: // Something went wrong header('Location: /'); -- cgit v1.2.3 From a7906d813ad342f06d4834c10c1200002f7342d2 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Fri, 3 Aug 2012 11:47:05 +0000 Subject: Move OAuth classes into lib/oauth --- lib/api.php | 4 +-- lib/oauth.php | 69 ----------------------------------------------- lib/oauth/server.php | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/oauth/store.php | 29 ++++++++++++++++++++ settings/oauth.php | 2 +- 5 files changed, 108 insertions(+), 72 deletions(-) delete mode 100644 lib/oauth.php create mode 100644 lib/oauth/server.php create mode 100644 lib/oauth/store.php (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index c8bd0aec2fa..8fdfc63070b 100644 --- a/lib/api.php +++ b/lib/api.php @@ -23,7 +23,7 @@ * License along with this library. If not, see . * */ - + class OC_API { private static $server; @@ -32,7 +32,7 @@ class OC_API { * initialises the OAuth store and server */ private static function init() { - self::$server = new OC_OAuthServer(new OC_OAuthStore()); + self::$server = new OC_OAuth_Server(new OC_OAuth_Store()); } /** diff --git a/lib/oauth.php b/lib/oauth.php deleted file mode 100644 index b72d9aab446..00000000000 --- a/lib/oauth.php +++ /dev/null @@ -1,69 +0,0 @@ -. -* -*/ - -class OC_OAuthServer extends OAuthServer { - - public function fetch_request_token(&$request) { - $this->get_version($request); - $consumer = $this->get_consumer($request); - $this->check_signature($request, $consumer, null); - $callback = $request->get_parameter('oauth_callback'); - $scope = $request->get_parameter('scope'); - // TODO Validate scopes - return $this->data_store->new_request_token($consumer, $scope, $callback); - } - - public function authoriseRequestToken(&$request) { - $this->get_version($request); - $consumer = $this->get_consumer($request); - $this->check_signature($request, $consumer, null); - $token = $this->get_token($request, $consumer, 'request'); - $this->check_signature($request, $consumer, $token); - return $this->data_store->authorise_request_token($token, $consumer, OC_User::getUser()); - } - - /** - * checks if request is authorised - * TODO distinguish between failures as one is a 400 error and other is 401 - * @return string|int - */ - public static function isAuthorised($scope) { - try { - $request = OAuthRequest::from_request(); - $this->verify_request(); - } catch (OAuthException $exception) { - return false; - } - // TODO Get user out of token? May have to write own verify_request() -// $run = true; -// OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $user )); -// if(!$run){ -// return false; -// } -// OC_User::setUserId($user); -// OC_Hook::emit( "OC_User", "post_login", array( "uid" => $user )); -// return $user; - } - -} \ No newline at end of file diff --git a/lib/oauth/server.php b/lib/oauth/server.php new file mode 100644 index 00000000000..c563c527601 --- /dev/null +++ b/lib/oauth/server.php @@ -0,0 +1,76 @@ +. +* +*/ + +require_once(OC::$THIRDPARTYROOT.'/3rdparty/OAuth/OAuth.php'); + +class OC_OAuth_Server extends OAuthServer { + + public function fetch_request_token(&$request) { + $this->get_version($request); + $consumer = $this->get_consumer($request); + $this->check_signature($request, $consumer, null); + $callback = $request->get_parameter('oauth_callback'); + $scope = $request->get_parameter('scope'); + // TODO Validate scopes + return $this->data_store->new_request_token($consumer, $scope, $callback); + } + + /** + * authorises a request token + * @param string $request the request token to authorise + * @return What does it return? + */ + public function authoriseRequestToken(&$request) { + $this->get_version($request); + $consumer = $this->get_consumer($request); + $this->check_signature($request, $consumer, null); + $token = $this->get_token($request, $consumer, 'request'); + $this->check_signature($request, $consumer, $token); + return $this->data_store->authorise_request_token($token, $consumer, OC_User::getUser()); + } + + /** + * checks if request is authorised + * TODO distinguish between failures as one is a 400 error and other is 401 + * @return string|int + */ + public static function isAuthorised($scope) { + try { + $request = OAuthRequest::from_request(); + $this->verify_request(); + } catch (OAuthException $exception) { + return false; + } + // TODO Get user out of token? May have to write own verify_request() +// $run = true; +// OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $user )); +// if(!$run){ +// return false; +// } +// OC_User::setUserId($user); +// OC_Hook::emit( "OC_User", "post_login", array( "uid" => $user )); +// return $user; + } + +} \ No newline at end of file diff --git a/lib/oauth/store.php b/lib/oauth/store.php new file mode 100644 index 00000000000..2f58e46b5b0 --- /dev/null +++ b/lib/oauth/store.php @@ -0,0 +1,29 @@ +. +* +*/ + +class OC_OAuth_Store extends OAuthDataStore { + + // To follow. + +} \ No newline at end of file diff --git a/settings/oauth.php b/settings/oauth.php index b04c798b1b0..7f30161d852 100644 --- a/settings/oauth.php +++ b/settings/oauth.php @@ -9,7 +9,7 @@ require_once('../lib/base.php'); // Logic $operation = isset($_GET['operation']) ? $_GET['operation'] : ''; -$server = new OC_OAuthServer(new OC_OAuthStore()); +$server = new OC_OAuth_Server(new OC_OAuth_Store()); switch($operation){ case 'register': -- cgit v1.2.3 From 6047a5fe515091d755e964c24de93fc29a5f9754 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Fri, 3 Aug 2012 11:56:11 +0000 Subject: API: Check if the consumer has permissions to access the requested method --- lib/api.php | 12 +++++++++--- lib/oauth/server.php | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index 8fdfc63070b..90f36aefbcd 100644 --- a/lib/api.php +++ b/lib/api.php @@ -73,11 +73,17 @@ class OC_API { // Loop through registered actions foreach(self::$actions[$name] as $action){ $app = $action['app']; - if(is_callable($action['action'])){ - $responses[] = array('app' => $app, 'response' => call_user_func($action['action'], $parameters)); + // Check the consumer has permission to call this method. + if(OC_OAuth_Server::isAuthorised('app_'.$app)){ + if(is_callable($action['action'])){ + $responses[] = array('app' => $app, 'response' => call_user_func($action['action'], $parameters)); + } else { + $responses[] = array('app' => $app, 'response' => 501); + } } else { - $responses[] = array('app' => $app, 'response' => 501); + $responses[] = array('app' => $app, 'response' => 401); } + } // Merge the responses $response = self::mergeResponses($responses); diff --git a/lib/oauth/server.php b/lib/oauth/server.php index c563c527601..b14277afea1 100644 --- a/lib/oauth/server.php +++ b/lib/oauth/server.php @@ -58,7 +58,8 @@ class OC_OAuth_Server extends OAuthServer { public static function isAuthorised($scope) { try { $request = OAuthRequest::from_request(); - $this->verify_request(); + //$this->verify_request(); // TODO cannot use $this in static context + return true; } catch (OAuthException $exception) { return false; } -- cgit v1.2.3 From 21f8646ffc9057bd15fe8a30b781ee20766b5656 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Fri, 3 Aug 2012 15:20:01 +0000 Subject: API: Fix merging of responses. Return 400 error when no OAuth operation sent. --- lib/api.php | 10 +++++----- settings/oauth.php | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index 90f36aefbcd..c91216179e2 100644 --- a/lib/api.php +++ b/lib/api.php @@ -107,16 +107,16 @@ class OC_API { $numresponses = count($responses); foreach($responses as $response){ - if(is_int($response) && empty($finalresponse)){ - $finalresponse = $response; + if(is_int($response['response']) && empty($finalresponse)){ + $finalresponse = $response['response']; continue; } - if(is_array($response)){ + if(is_array($response['response'])){ // Shipped apps win if(OC_App::isShipped($response['app'])){ - $finalresponse = array_merge_recursive($finalresponse, $response); + $finalresponse = array_merge_recursive($finalresponse, $response['response']); } else { - $finalresponse = array_merge_recursive($response, $finalresponse); + $finalresponse = array_merge_recursive($response['response'], $finalresponse); } } } diff --git a/settings/oauth.php b/settings/oauth.php index 7f30161d852..f088453a26a 100644 --- a/settings/oauth.php +++ b/settings/oauth.php @@ -76,8 +76,8 @@ switch($operation){ } break; default: - // Something went wrong - header('Location: /'); + // Something went wrong, we need an operation! + OC_Response::setStatus(400); break; } -- cgit v1.2.3 From 0d1d2c0b61a4a0bcbc4b08a927fa815f4673d31e Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Thu, 30 Aug 2012 14:01:27 +0000 Subject: Fix class name --- lib/api.php | 2 +- settings/oauth.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index c91216179e2..55de438f429 100644 --- a/lib/api.php +++ b/lib/api.php @@ -166,7 +166,7 @@ class OC_API { */ public static function checkLoggedIn(){ // Check OAuth - if(!OC_OAuthServer::isAuthorised()){ + if(!OC_OAuth_Server::isAuthorised()){ OC_Response::setStatus(401); die(); } diff --git a/settings/oauth.php b/settings/oauth.php index f088453a26a..c6c9be515bf 100644 --- a/settings/oauth.php +++ b/settings/oauth.php @@ -22,7 +22,7 @@ switch($operation){ $token = $server->fetch_request_token($request); echo $token; } catch (OAuthException $exception) { - OC_Log::write('OC_OAuthServer', $exception->getMessage(), OC_LOG::ERROR); + OC_Log::write('OC_OAuth_Server', $exception->getMessage(), OC_LOG::ERROR); echo $exception->getMessage(); } break; @@ -71,7 +71,7 @@ switch($operation){ $token = $server->fetch_access_token($request); echo $token; } catch (OAuthException $exception) { - OC_Log::write('OC_OAuthServer', $exception->getMessage(), OC_LOG::ERROR); + OC_Log::write('OC_OAuth_Server', $exception->getMessage(), OC_LOG::ERROR); echo $exception->getMessage(); } break; -- cgit v1.2.3 From 67c2d56be81a48ba63ce92d5fa0ff339be9ca5a5 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Thu, 30 Aug 2012 14:02:31 +0000 Subject: Add ownCloud OAuth store backend. WIP --- lib/oauth/store.php | 74 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 69 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/oauth/store.php b/lib/oauth/store.php index 2f58e46b5b0..f1df7d49b93 100644 --- a/lib/oauth/store.php +++ b/lib/oauth/store.php @@ -2,10 +2,10 @@ /** * ownCloud * -* @author Tom Needham * @author Michael Gapczynski -* @copyright 2012 Tom Needham tom@owncloud.com +* @author Tom Needham * @copyright 2012 Michael Gapczynski mtgap@owncloud.com +* @copyright 2012 Tom Needham tom@owncloud.com * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -22,8 +22,72 @@ * */ -class OC_OAuth_Store extends OAuthDataStore { +class OC_OAuth_Store { + + function lookup_consumer($consumer_key) { + $query = OC_DB::prepare("SELECT `key`, `secret`, `callback` FROM `*PREFIX*oauth_consumers` WHERE `key` = ?"); + $results = $query->execute(array($consumer_key)); + if($results->numRows()==0){ + return NULL; + } else { + $details = $results->fetchRow(); + $callback = !empty($details['callback']) ? $details['callback'] : NULL; + return new OAuthConsumer($details['key'], $details['secret'], $callback); + } + } + + function lookup_token($consumer, $token_type, $token) { + $query = OC_DB::prepare("SELECT `key`, `secret`, `type` FROM `*PREFIX*oauth_tokens` WHERE `consumer_key` = ? AND `key` = ? AND `type` = ?"); + $results = $query->execute(array($consumer->key, $token->key, $token_type)); + if($results->numRows()==0){ + return NULL; + } else { + $token = $results->fetchRow(); + return new OAuthToken($token['key'], $token['secret']); + } + } + + function lookup_nonce($consumer, $token, $nonce, $timestamp) { + $query = OC_DB::prepare("INSERT INTO `*PREFIX*oauth_nonce` (`consumer_key`, `token`, `timestamp`, `nonce`) VALUES (?, ?, ?, ?)"); + $affectedrows = $query->exec(array($consumer->key, $token->key, $timestamp, $nonce)); + // Delete all timestamps older than the one passed + $query = OC_DB::prepare("DELETE FROM `*PREFIX*oauth_nonce` WHERE `consumer_key` = ? AND `token` = ? AND `timestamp` < ?"); + $query->execute(array($consumer->key, $token->key, $timestamp - self::MAX_TIMESTAMP_DIFFERENCE)); + return $result; + } + + function new_token($consumer, $token_type, $scope = null) { + $key = md5(time()); + $secret = time() + time(); + $token = new OAuthToken($key, md5(md5($secret))); + $query = OC_DB::prepare("INSERT INTO `*PREFIX*oauth_tokens` (`consumer_key`, `key`, `secret`, `type`, `scope`, `timestamp`) VALUES (?, ?, ?, ?, ?, ?)"); + $result = $query->execute(array($consumer->key, $key, $secret, $token_type, $scope, time())); + return $token; + } + + function new_request_token($consumer, $scope, $callback = null) { + return $this->new_token($consumer, 'request', $scope); + } + + function authorise_request_token($token, $consumer, $uid) { + $query = OC_DB::prepare("UPDATE `*PREFIX*oauth_tokens` SET uid = ? WHERE `consumer_key` = ? AND `key` = ? AND `type` = ?"); + $query->execute(array($uid, $consumer->key, $token->key, 'request')); + // TODO Return oauth_verifier + } + + function new_access_token($token, $consumer, $verifier = null) { + $query = OC_DB::prepare("SELECT `timestamp`, `scope` FROM `*PREFIX*oauth_tokens` WHERE `consumer_key` = ? AND `key` = ? AND `type` = ?"); + $result = $query->execute(array($consumer->key, $token->key, 'request'))->fetchRow(); + if (isset($result['timestamp'])) { + if ($timestamp + self::MAX_REQUEST_TOKEN_TTL < time()) { + return false; + } + $accessToken = $this->new_token($consumer, 'access', $result['scope']); + } + // Delete request token + $query = OC_DB::prepare("DELETE FROM `*PREFIX*oauth_tokens` WHERE `key` = ? AND `type` = ?"); + $query->execute(array($token->key, 'request')); + return $accessToken; + } - // To follow. - } \ No newline at end of file -- cgit v1.2.3 From 37bb16becb11caf80fd2e4f608e16f7642c76137 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Tue, 4 Sep 2012 11:10:42 +0000 Subject: API: Add callback_fail, add OC_OAuth::init and bespoke request token method --- lib/oauth/server.php | 50 ++++++++++++++++++++++++++++++++++++++++++-------- lib/oauth/store.php | 22 ++++++++++++---------- settings/oauth.php | 27 +++++++++++++++++++++------ 3 files changed, 75 insertions(+), 24 deletions(-) (limited to 'lib') diff --git a/lib/oauth/server.php b/lib/oauth/server.php index b14277afea1..a82a1e2fb0e 100644 --- a/lib/oauth/server.php +++ b/lib/oauth/server.php @@ -26,16 +26,31 @@ require_once(OC::$THIRDPARTYROOT.'/3rdparty/OAuth/OAuth.php'); class OC_OAuth_Server extends OAuthServer { - public function fetch_request_token(&$request) { - $this->get_version($request); - $consumer = $this->get_consumer($request); - $this->check_signature($request, $consumer, null); - $callback = $request->get_parameter('oauth_callback'); - $scope = $request->get_parameter('scope'); - // TODO Validate scopes - return $this->data_store->new_request_token($consumer, $scope, $callback); + /** + * sets up the server object + */ + public static function init(){ + $server = new OC_OAuth_Server(new OC_OAuth_Store()); + $server->add_signature_method(new OAuthSignatureMethod_HMAC_SHA1()); + return $server; + } + + public function get_request_token(&$request){ + // Check the signature + $token = $this->fetch_request_token($request); + $scopes = $request->get_parameter('scopes'); + // Add scopes to request token + $this->saveScopes($token, $scopes); + + return $token; } + public function saveScopes($token, $scopes){ + $query = OC_DB::prepare("INSERT INTO `*PREFIX*oauth_scopes` (`key`, `scopes`) VALUES (?, ?)"); + $result = $query->execute(array($token->key, $scopes)); + } + + /** * authorises a request token * @param string $request the request token to authorise @@ -74,4 +89,23 @@ class OC_OAuth_Server extends OAuthServer { // return $user; } + /** + * registers a consumer with the ownCloud Instance + * @param string $name the name of the external app + * @param string $url the url to find out more info on the external app + * @param string $callbacksuccess the url to redirect to after autorisation success + * @param string $callbackfail the url to redirect to if the user does not authorise the application + * @return false|OAuthConsumer object + */ + static function register_consumer($name, $url, $callbacksuccess=null, $callbackfail=null){ + // TODO validation + // Check callback url is outside of ownCloud for security + // Generate key and secret + $key = sha1(md5(uniqid(rand(), true))); + $secret = sha1(md5(uniqid(rand(), true))); + $query = OC_DB::prepare("INSERT INTO `*PREFIX*oauth_consumers` (`key`, `secret`, `name`, `url`, `callback_success`, `callback_fail`) VALUES (?, ?, ?, ?, ?, ?)"); + $result = $query->execute(array($key, $secret, $name, $url, $callbacksuccess, $callbackfail)); + return new OAuthConsumer($key, $secret, $callbacksuccess); + } + } \ No newline at end of file diff --git a/lib/oauth/store.php b/lib/oauth/store.php index f1df7d49b93..aa68d38957d 100644 --- a/lib/oauth/store.php +++ b/lib/oauth/store.php @@ -22,16 +22,18 @@ * */ -class OC_OAuth_Store { +class OC_OAuth_Store extends OAuthDataStore { + + static private $MAX_TIMESTAMP_DIFFERENCE = 300; function lookup_consumer($consumer_key) { - $query = OC_DB::prepare("SELECT `key`, `secret`, `callback` FROM `*PREFIX*oauth_consumers` WHERE `key` = ?"); + $query = OC_DB::prepare("SELECT `key`, `secret`, `callback_success` FROM `*PREFIX*oauth_consumers` WHERE `key` = ?"); $results = $query->execute(array($consumer_key)); if($results->numRows()==0){ return NULL; } else { $details = $results->fetchRow(); - $callback = !empty($details['callback']) ? $details['callback'] : NULL; + $callback = !empty($details['callback_success']) ? $details['callback_success'] : NULL; return new OAuthConsumer($details['key'], $details['secret'], $callback); } } @@ -49,24 +51,24 @@ class OC_OAuth_Store { function lookup_nonce($consumer, $token, $nonce, $timestamp) { $query = OC_DB::prepare("INSERT INTO `*PREFIX*oauth_nonce` (`consumer_key`, `token`, `timestamp`, `nonce`) VALUES (?, ?, ?, ?)"); - $affectedrows = $query->exec(array($consumer->key, $token->key, $timestamp, $nonce)); + $affectedrows = $query->execute(array($consumer->key, $token, $timestamp, $nonce)); // Delete all timestamps older than the one passed $query = OC_DB::prepare("DELETE FROM `*PREFIX*oauth_nonce` WHERE `consumer_key` = ? AND `token` = ? AND `timestamp` < ?"); - $query->execute(array($consumer->key, $token->key, $timestamp - self::MAX_TIMESTAMP_DIFFERENCE)); + $result = $query->exec(array($consumer->key, $token, $timestamp - self::$MAX_TIMESTAMP_DIFFERENCE)); return $result; } - function new_token($consumer, $token_type, $scope = null) { + function new_token($consumer, $token_type) { $key = md5(time()); $secret = time() + time(); $token = new OAuthToken($key, md5(md5($secret))); - $query = OC_DB::prepare("INSERT INTO `*PREFIX*oauth_tokens` (`consumer_key`, `key`, `secret`, `type`, `scope`, `timestamp`) VALUES (?, ?, ?, ?, ?, ?)"); - $result = $query->execute(array($consumer->key, $key, $secret, $token_type, $scope, time())); + $query = OC_DB::prepare("INSERT INTO `*PREFIX*oauth_tokens` (`consumer_key`, `key`, `secret`, `type`, `timestamp`) VALUES (?, ?, ?, ?, ?, ?)"); + $result = $query->execute(array($consumer->key, $key, $secret, $token_type, time())); return $token; } - function new_request_token($consumer, $scope, $callback = null) { - return $this->new_token($consumer, 'request', $scope); + function new_request_token($consumer, $callback = null) { + return $this->new_token($consumer, 'request'); } function authorise_request_token($token, $consumer, $uid) { diff --git a/settings/oauth.php b/settings/oauth.php index c6c9be515bf..8dba9b33a53 100644 --- a/settings/oauth.php +++ b/settings/oauth.php @@ -6,27 +6,41 @@ */ require_once('../lib/base.php'); - // Logic $operation = isset($_GET['operation']) ? $_GET['operation'] : ''; -$server = new OC_OAuth_Server(new OC_OAuth_Store()); +$server = OC_OAuth_server::init(); + switch($operation){ case 'register': - + + // Here external apps can register with an ownCloud + if(empty($_GET['name']) || empty($_GET['url'])){ + // Invalid request + echo 401; + } else { + $callbacksuccess = empty($_GET['callback_success']) ? null : $_GET['callback_success']; + $callbackfail = empty($_GET['callback_fail']) ? null : $_GET['callback_fail']; + $consumer = OC_OAuth_Server::register_consumer($_GET['name'], $_GET['url'], $callbacksuccess, $callbackfail); + + echo 'Registered consumer successfully!

Key: ' . $consumer->key . '
Secret: ' . $consumer->secret; + } break; case 'request_token': + try { $request = OAuthRequest::from_request(); - $token = $server->fetch_request_token($request); + $token = $server->get_request_token($request); echo $token; } catch (OAuthException $exception) { OC_Log::write('OC_OAuth_Server', $exception->getMessage(), OC_LOG::ERROR); echo $exception->getMessage(); } - break; + + break; case 'authorise'; + OC_API::checkLoggedIn(); // Example $consumer = array( @@ -74,7 +88,8 @@ switch($operation){ OC_Log::write('OC_OAuth_Server', $exception->getMessage(), OC_LOG::ERROR); echo $exception->getMessage(); } - break; + + break; default: // Something went wrong, we need an operation! OC_Response::setStatus(400); -- cgit v1.2.3 From 4224eb88314bdece2a254decf7ebf9ffd7b57678 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Tue, 4 Sep 2012 13:50:56 +0000 Subject: API: remove OAuth auth check, respond in ocs formatted xml/json --- lib/api.php | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index 55de438f429..92fa05bd719 100644 --- a/lib/api.php +++ b/lib/api.php @@ -74,15 +74,15 @@ class OC_API { foreach(self::$actions[$name] as $action){ $app = $action['app']; // Check the consumer has permission to call this method. - if(OC_OAuth_Server::isAuthorised('app_'.$app)){ + //if(OC_OAuth_Server::isAuthorised('app_'.$app)){ if(is_callable($action['action'])){ $responses[] = array('app' => $app, 'response' => call_user_func($action['action'], $parameters)); } else { $responses[] = array('app' => $app, 'response' => 501); } - } else { - $responses[] = array('app' => $app, 'response' => 401); - } + //} else { + // $responses[] = array('app' => $app, 'response' => 401); + //} } // Merge the responses @@ -103,25 +103,39 @@ class OC_API { * @return array the final merged response */ private static function mergeResponses($responses){ - $finalresponse = array(); + $finalresponse = array( + 'meta' => array( + 'statuscode' => '', + ), + 'data' => array(), + ); $numresponses = count($responses); foreach($responses as $response){ - if(is_int($response['response']) && empty($finalresponse)){ - $finalresponse = $response['response']; + if(is_int($response['response']) && empty($finalresponse['meta']['statuscode'])){ + $finalresponse['meta']['statuscode'] = $response['response']; continue; } if(is_array($response['response'])){ // Shipped apps win if(OC_App::isShipped($response['app'])){ - $finalresponse = array_merge_recursive($finalresponse, $response['response']); + $finalresponse['data'] = array_merge_recursive($finalresponse['data'], $response['response']); } else { - $finalresponse = array_merge_recursive($response['response'], $finalresponse); + $finalresponse['data'] = array_merge_recursive($response['response'], $finalresponse['data']); } + $finalresponse['meta']['statuscode'] = 100; } } - - return $finalresponse; + //Some tidying up + if($finalresponse['meta']['statuscode']=='100'){ + $finalresponse['meta']['status'] = 'ok'; + } else { + $finalresponse['meta']['status'] = 'failure'; + } + if(empty($finalresponse['data'])){ + unset($finalresponse['data']); + } + return array('ocs' => $finalresponse); } /** -- cgit v1.2.3 From 470b87f62574f62ce132cd24a9c014aac51ddc91 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Wed, 5 Sep 2012 09:07:15 +0000 Subject: Fix ocs/person/check --- lib/ocs/person.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/ocs/person.php b/lib/ocs/person.php index 629a7c2e6c7..c757385dfe1 100644 --- a/lib/ocs/person.php +++ b/lib/ocs/person.php @@ -3,10 +3,11 @@ class OC_OCS_Person { public static function check($parameters){ - - if($parameters['login']<>''){ - if(OC_User::login($parameters['login'],$parameters['password'])){ - $xml['person']['personid'] = $parameters['login']; + $login = isset($_POST['login']) ? $_POST['login'] : false; + $password = isset($_POST['password']) ? $_POST['password'] : false; + if($login && $password){ + if(OC_User::checkPassword($login,$password)){ + $xml['person']['personid'] = $login; return $xml; }else{ return 102; -- cgit v1.2.3 From 28a11959d744fd5e23c4a5543c24863c77160644 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Wed, 5 Sep 2012 12:32:54 +0000 Subject: API: Fix /person/check api method --- lib/ocs/person.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/ocs/person.php b/lib/ocs/person.php index c757385dfe1..23b8853533d 100644 --- a/lib/ocs/person.php +++ b/lib/ocs/person.php @@ -16,4 +16,5 @@ class OC_OCS_Person { return 101; } } + } -- cgit v1.2.3 From fa5dff22a02aeb5985215454549ab1020382b197 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Thu, 13 Sep 2012 09:41:20 +0000 Subject: API: Require api calls to register the required auth level --- lib/api.php | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 56 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index 92fa05bd719..c278f7672f1 100644 --- a/lib/api.php +++ b/lib/api.php @@ -26,6 +26,14 @@ class OC_API { + /** + * API authentication levels + */ + const GUEST_AUTH = 0; + const USER_AUTH = 1; + const SUBADMIN_AUTH = 2; + const ADMIN_AUTH = 3; + private static $server; /** @@ -46,8 +54,12 @@ class OC_API { * @param string $url the url to match * @param callable $action the function to run * @param string $app the id of the app registering the call + * @param int $authlevel the level of authentication required for the call + * @param array $defaults + * @param array $requirements */ - public static function register($method, $url, $action, $app, + public static function register($method, $url, $action, $app, + $authlevel = OC_API::USER_AUTH, $defaults = array(), $requirements = array()){ $name = strtolower($method).$url; @@ -61,7 +73,7 @@ class OC_API { ->action('OC_API', 'call'); self::$actions[$name] = array(); } - self::$actions[$name][] = array('app' => $app, 'action' => $action); + self::$actions[$name][] = array('app' => $app, 'action' => $action, 'authlevel' => $authlevel); } /** @@ -73,16 +85,16 @@ class OC_API { // Loop through registered actions foreach(self::$actions[$name] as $action){ $app = $action['app']; - // Check the consumer has permission to call this method. - //if(OC_OAuth_Server::isAuthorised('app_'.$app)){ + // Authorsie this call + if($this->isAuthorised($action)){ if(is_callable($action['action'])){ $responses[] = array('app' => $app, 'response' => call_user_func($action['action'], $parameters)); } else { $responses[] = array('app' => $app, 'response' => 501); } - //} else { - // $responses[] = array('app' => $app, 'response' => 401); - //} + } else { + $responses[] = array('app' => $app, 'response' => 401); + } } // Merge the responses @@ -97,6 +109,43 @@ class OC_API { OC_User::logout(); } + /** + * authenticate the api call + * @param array $action the action details as supplied to OC_API::register() + * @return bool + */ + private function isAuthorised($action){ + $level = $action['authlevel']; + switch($level){ + case OC_API::GUEST_AUTH: + // Anyone can access + return true; + break; + case OC_API::USER_AUTH: + // User required + // Check url for username and password + break; + case OC_API::SUBADMIN_AUTH: + // Check for subadmin + break; + case OC_API::ADMIN_AUTH: + // Check for admin + break; + default: + // oops looks like invalid level supplied + return false; + break; + } + } + + /** + * gets login details from url and logs in the user + * @return bool + */ + public function loginUser(){ + // Todo + } + /** * intelligently merges the different responses * @param array $responses -- cgit v1.2.3 From 182f890110f86ced32177dde2ac2fc2437bb2305 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Thu, 13 Sep 2012 10:32:35 +0000 Subject: Remove a merge conflict --- lib/base.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/base.php b/lib/base.php index c7f6fd8ad85..0da33b4d0ff 100644 --- a/lib/base.php +++ b/lib/base.php @@ -268,7 +268,6 @@ class OC{ session_start(); } -<<<<<<< HEAD public static function loadapp(){ if(file_exists(OC_App::getAppPath(OC::$REQUESTEDAPP) . '/index.php')){ require_once(OC_App::getAppPath(OC::$REQUESTEDAPP) . '/index.php'); @@ -304,9 +303,7 @@ class OC{ } public static function init(){ -======= - public static function init() { ->>>>>>> master + // register autoloader spl_autoload_register(array('OC','autoload')); setlocale(LC_ALL, 'en_US.UTF-8'); -- cgit v1.2.3 From b261c980c71112fb74541e4c93901ae12449b0d0 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Thu, 13 Sep 2012 10:50:10 +0000 Subject: Fix autoloader merge conflict --- lib/base.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/base.php b/lib/base.php index 0da33b4d0ff..2b05fd7f9ea 100644 --- a/lib/base.php +++ b/lib/base.php @@ -95,11 +95,13 @@ class OC{ $path = str_replace('_', '/', $className) . '.php'; } elseif(strpos($className,'Symfony\\')===0){ - require_once str_replace('\\','/',$className) . '.php'; + $path = str_replace('\\','/',$className) . '.php'; } elseif(strpos($className,'Test_')===0){ - require_once 'tests/lib/'.strtolower(str_replace('_','/',substr($className,5)) . '.php'); + $path = 'tests/lib/'.strtolower(str_replace('_','/',substr($className,5)) . '.php'); + } else { + return false; } if($fullPath = stream_resolve_include_path($path)) { -- cgit v1.2.3 From 8b409dfe2ad634b84dcbcc54cdd668488318e79b Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Thu, 13 Sep 2012 14:15:04 +0000 Subject: API: Default to user authentication level --- lib/public/api.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/public/api.php b/lib/public/api.php index ed1f6ef237c..2821554229b 100644 --- a/lib/public/api.php +++ b/lib/public/api.php @@ -33,9 +33,10 @@ class API { * @param string $url the url to match * @param callable $action the function to run * @param string $app the id of the app registering the call + * @param int $authlevel the level of authentication required for the call (See OC_API constants) */ - public static function register($method, $url, $action, $app){ - \OC_API::register($method, $url, $action, $app); + public static function register($method, $url, $action, $app, $authlevel = OC_API::USER_AUTH){ + \OC_API::register($method, $url, $action, $app, $authlevel); } } -- cgit v1.2.3 From a8c82440d0f4158151b9f28c6bfc0bbc14aea3e1 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Thu, 13 Sep 2012 15:18:38 +0000 Subject: API: Use http authentication, check the auth level required --- lib/api.php | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index c278f7672f1..29446e979fe 100644 --- a/lib/api.php +++ b/lib/api.php @@ -86,7 +86,7 @@ class OC_API { foreach(self::$actions[$name] as $action){ $app = $action['app']; // Authorsie this call - if($this->isAuthorised($action)){ + if(self::isAuthorised($action)){ if(is_callable($action['action'])){ $responses[] = array('app' => $app, 'response' => call_user_func($action['action'], $parameters)); } else { @@ -105,7 +105,7 @@ class OC_API { } else { self::respond($response); } - // logout the user to be stateles + // logout the user to be stateless OC_User::logout(); } @@ -114,7 +114,7 @@ class OC_API { * @param array $action the action details as supplied to OC_API::register() * @return bool */ - private function isAuthorised($action){ + private static function isAuthorised($action){ $level = $action['authlevel']; switch($level){ case OC_API::GUEST_AUTH: @@ -123,13 +123,25 @@ class OC_API { break; case OC_API::USER_AUTH: // User required - // Check url for username and password + return self::loginUser(); break; case OC_API::SUBADMIN_AUTH: // Check for subadmin + $user = self::loginUser(); + if(!$user){ + return false; + } else { + return OC_SubAdmin::isSubAdmin($user); + } break; case OC_API::ADMIN_AUTH: // Check for admin + $user = self::loginUser(); + if(!$user){ + return false; + } else { + return OC_Group::inGroup($user, 'admin'); + } break; default: // oops looks like invalid level supplied @@ -139,11 +151,13 @@ class OC_API { } /** - * gets login details from url and logs in the user - * @return bool + * http basic auth + * @return string|false (username, or false on failure) */ - public function loginUser(){ - // Todo + private static function loginUser(){ + $authuser = isset($_SERVER['PHP_AUTH_USER']) ? $_SERVER['PHP_AUTH_USER'] : ''; + $authpw = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : ''; + return OC_User::login($authuser, $authpw) ? $authuser : false; } /** @@ -222,17 +236,6 @@ class OC_API { $writer->writeElement($k, $v); } } - } - /** - * check if the user is authenticated - */ - public static function checkLoggedIn(){ - // Check OAuth - if(!OC_OAuth_Server::isAuthorised()){ - OC_Response::setStatus(401); - die(); - } - } } -- cgit v1.2.3 From 0f07226270d02ba7b8b1da8247cdbcb206a6c744 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Fri, 14 Sep 2012 13:41:06 +0000 Subject: API: Allow admins to access SUBADMIN api methods --- lib/api.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index 29446e979fe..ba6e880261d 100644 --- a/lib/api.php +++ b/lib/api.php @@ -131,7 +131,13 @@ class OC_API { if(!$user){ return false; } else { - return OC_SubAdmin::isSubAdmin($user); + $subadmin = OC_SubAdmin::isSubAdmin($user); + $admin = OC_Group::inGroup($user, 'admin'); + if($subadmin || $admin){ + return true; + } else { + return false; + } } break; case OC_API::ADMIN_AUTH: @@ -236,6 +242,6 @@ class OC_API { $writer->writeElement($k, $v); } } - + } } -- cgit v1.2.3 From 8926038591a2c290580f13cbb5d8581d0f7861e5 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Mon, 17 Sep 2012 12:07:42 +0000 Subject: API: Fix merge conflict remnants --- lib/ocs.php | 1 - 1 file changed, 1 deletion(-) (limited to 'lib') diff --git a/lib/ocs.php b/lib/ocs.php index 6cdb2480860..1cec3ecc7c0 100644 --- a/lib/ocs.php +++ b/lib/ocs.php @@ -82,7 +82,6 @@ class OC_OCS { echo('internal server error: method not supported'); exit(); } -<<<<<<< HEAD $format = self::readData($method, 'format', 'text', ''); $txt='Invalid query, please check the syntax. API specifications are here: http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n"; $txt.=OC_OCS::getDebugOutput(); -- cgit v1.2.3 From 3ea01df1cdc3fe8774bf7e2d5eb93cc0fe809345 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Mon, 17 Sep 2012 12:08:17 +0000 Subject: API: Parse PUT and DELETE variables --- lib/api.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index ba6e880261d..29403030233 100644 --- a/lib/api.php +++ b/lib/api.php @@ -81,6 +81,12 @@ class OC_API { * @param array $parameters */ public static function call($parameters){ + // Prepare the request variables + if($_SERVER['REQUEST_METHOD'] == 'PUT'){ + parse_str(file_get_contents("php://input"), $_PUT); + } else if($_SERVER['REQUEST_METHOD'] == 'DELETE'){ + parse_str(file_get_contents("php://input"), $_DELETE); + } $name = $parameters['_route']; // Loop through registered actions foreach(self::$actions[$name] as $action){ -- cgit v1.2.3 From 07111ff672037282a6ca870fc19eab9f36875ea0 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Sun, 28 Oct 2012 11:04:23 +0000 Subject: Allow apps to pass defaults and requirements for their API calls --- lib/public/api.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/public/api.php b/lib/public/api.php index 2821554229b..9d6d1153e6c 100644 --- a/lib/public/api.php +++ b/lib/public/api.php @@ -34,9 +34,11 @@ class API { * @param callable $action the function to run * @param string $app the id of the app registering the call * @param int $authlevel the level of authentication required for the call (See OC_API constants) + * @param array $defaults + * @param array $requirements */ - public static function register($method, $url, $action, $app, $authlevel = OC_API::USER_AUTH){ - \OC_API::register($method, $url, $action, $app, $authlevel); + public static function register($method, $url, $action, $app, $authlevel = OC_API::USER_AUTH, $defaults = array(), $requirements = array()){ + \OC_API::register($method, $url, $action, $app, $authlevel, $defaults, $requirements); } } -- cgit v1.2.3 From b07944798848bc5196dc75e8d8caea5ca71b0f15 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Sun, 28 Oct 2012 11:06:47 +0000 Subject: Add API method for sharing a file, currently only via a link. --- apps/files_sharing/appinfo/app.php | 3 ++- apps/files_sharing/appinfo/routes.php | 24 ++++++++++++++++++ apps/files_sharing/lib/api.php | 46 +++++++++++++++++++++++++++++++++++ lib/api.php | 2 +- 4 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 apps/files_sharing/appinfo/routes.php create mode 100644 apps/files_sharing/lib/api.php (limited to 'lib') diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index 109f86b2e87..1402a146454 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -3,7 +3,8 @@ OC::$CLASSPATH['OC_Share_Backend_File'] = "apps/files_sharing/lib/share/file.php"; OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'apps/files_sharing/lib/share/folder.php'; OC::$CLASSPATH['OC_Filestorage_Shared'] = "apps/files_sharing/lib/sharedstorage.php"; +OC::$CLASSPATH['OC_Sharing_API'] = "apps/files_sharing/lib/api.php"; OCP\Util::connectHook('OC_Filesystem', 'setup', 'OC_Filestorage_Shared', 'setup'); OCP\Share::registerBackend('file', 'OC_Share_Backend_File'); OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file'); -OCP\Util::addScript('files_sharing', 'share'); +OCP\Util::addScript('files_sharing', 'share'); \ No newline at end of file diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php new file mode 100644 index 00000000000..d10607aa600 --- /dev/null +++ b/apps/files_sharing/appinfo/routes.php @@ -0,0 +1,24 @@ +. +* +*/ +OCP\API::register('post', '/cloud/files/share/{type}/{path}', array('OC_Sharing_API', 'shareFile'), 'files_sharing', OC_API::USER_AUTH, array(), array('type' => 'user|group|link|email|contact|remote', 'path' => '.*')); + +?> \ No newline at end of file diff --git a/apps/files_sharing/lib/api.php b/apps/files_sharing/lib/api.php new file mode 100644 index 00000000000..b1dc0d9e68e --- /dev/null +++ b/apps/files_sharing/lib/api.php @@ -0,0 +1,46 @@ + OCP\Share::SHARE_TYPE_USER, + 'group' => OCP\Share::SHARE_TYPE_GROUP, + 'link' => OCP\Share::SHARE_TYPE_LINK, + 'email' => OCP\Share::SHARE_TYPE_EMAIL, + 'contact' => OCP\Share::SHARE_TYPE_CONTACT, + 'remote' => OCP\Share::SHARE_TYPE_USER, + ); + $type = $typemap[$parameters['type']]; + $shareWith = isset($_POST['shareWith']) ? $_POST['shareWith'] : ''; + $permissionstring = isset($_POST['permissions']) ? $_POST['permissions'] : ''; + $permissionmap = array( + 'C' => OCP\Share::PERMISSION_CREATE, + 'R' => OCP\Share::PERMISSION_READ, + 'U' => OCP\Share::PERMISSION_UPDATE, + 'D' => OCP\Share::PERMISSION_DELETE, + 'S' => OCP\Share::PERMISSION_SHARE, + ); + $permissions = 0; + foreach($permissionmap as $letter => $permission) { + if(strpos($permissionstring, $letter) !== false) { + $permissions += $permission; + } + } + + try { + OCP\Share::shareItem('file', $fileid, $type, $shareWith, $permissions); + } catch (Exception $e){ + error_log($e->getMessage()); + } + switch($type){ + case OCP\Share::SHARE_TYPE_LINK: + return array('url' => OC_Helper::linkToPublic('files') . '&file=' . OC_User::getUser() . '/files' . $path); + break; + } + + } + +} \ No newline at end of file diff --git a/lib/api.php b/lib/api.php index 29403030233..d11c3799d9a 100644 --- a/lib/api.php +++ b/lib/api.php @@ -91,7 +91,7 @@ class OC_API { // Loop through registered actions foreach(self::$actions[$name] as $action){ $app = $action['app']; - // Authorsie this call + // Authorise this call if(self::isAuthorised($action)){ if(is_callable($action['action'])){ $responses[] = array('app' => $app, 'response' => call_user_func($action['action'], $parameters)); -- cgit v1.2.3 From 115dbc721d77509274e7a1bacf0239ada565b005 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Tue, 11 Dec 2012 22:36:46 +0000 Subject: API: Specify the response format using a GET parameter --- lib/api.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index d11c3799d9a..cc1d9fccaff 100644 --- a/lib/api.php +++ b/lib/api.php @@ -66,10 +66,8 @@ class OC_API { $name = str_replace(array('/', '{', '}'), '_', $name); if(!isset(self::$actions[$name])){ OC::getRouter()->useCollection('ocs'); - OC::getRouter()->create($name, $url.'.{_format}') + OC::getRouter()->create($name, $url) ->method($method) - ->defaults(array('_format' => 'xml') + $defaults) - ->requirements(array('_format' => 'xml|json') + $requirements) ->action('OC_API', 'call'); self::$actions[$name] = array(); } @@ -106,11 +104,9 @@ class OC_API { // Merge the responses $response = self::mergeResponses($responses); // Send the response - if(isset($parameters['_format'])){ - self::respond($response, $parameters['_format']); - } else { - self::respond($response); - } + $formats = array('json', 'xml'); + $format = !empty($_GET['format']) && in_array($_GET['format'], $formats) ? $_GET['format'] : 'xml'; + self::respond($response, $format); // logout the user to be stateless OC_User::logout(); } @@ -218,7 +214,7 @@ class OC_API { * @param int|array $response the response * @param string $format the format xml|json */ - private static function respond($response, $format='json'){ + private static function respond($response, $format='xml'){ if ($format == 'json') { OC_JSON::encodedPrint($response); } else if ($format == 'xml') { -- cgit v1.2.3 From 4265419bbd1bae1fb62e7f07b6ef46cd60d1325f Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Wed, 12 Dec 2012 16:27:37 +0100 Subject: Try to fix #836 https://github.com/owncloud/core/issues/836 --- lib/MDB2/Driver/sqlite3.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php index fa4c91c1269..9839dafbce1 100644 --- a/lib/MDB2/Driver/sqlite3.php +++ b/lib/MDB2/Driver/sqlite3.php @@ -98,8 +98,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common if ($this->connection) { $native_code = $this->connection->lastErrorCode(); } - $native_msg = $this->_lasterror - ? html_entity_decode($this->_lasterror) : $this->connection->lastErrorMsg(); + $native_msg = html_entity_decode($this->_lasterror); // PHP 5.2+ prepends the function name to $php_errormsg, so we need // this hack to work around it, per bug #9599. -- cgit v1.2.3 From 140141edf2c5d89f083b4d254c0533e0209d517b Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Wed, 12 Dec 2012 16:50:25 +0000 Subject: API: Further tidying, implement OC_OCS_Result object for api results. --- lib/api.php | 69 +++++++----------------------------------------------- lib/ocs/result.php | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 60 deletions(-) create mode 100644 lib/ocs/result.php (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index cc1d9fccaff..e119b878210 100644 --- a/lib/api.php +++ b/lib/api.php @@ -71,7 +71,7 @@ class OC_API { ->action('OC_API', 'call'); self::$actions[$name] = array(); } - self::$actions[$name][] = array('app' => $app, 'action' => $action, 'authlevel' => $authlevel); + self::$actions[$name] = array('app' => $app, 'action' => $action, 'authlevel' => $authlevel); } /** @@ -87,22 +87,11 @@ class OC_API { } $name = $parameters['_route']; // Loop through registered actions - foreach(self::$actions[$name] as $action){ - $app = $action['app']; - // Authorise this call - if(self::isAuthorised($action)){ - if(is_callable($action['action'])){ - $responses[] = array('app' => $app, 'response' => call_user_func($action['action'], $parameters)); - } else { - $responses[] = array('app' => $app, 'response' => 501); - } - } else { - $responses[] = array('app' => $app, 'response' => 401); - } - - } - // Merge the responses - $response = self::mergeResponses($responses); + if(is_callable(self::$actions[$name]['action'])){ + $response = call_user_func(self::$actions[$name]['action'], $parameters); + } else { + $response = new OC_OCS_Result(null, 998, 'Internal server error.'); + } // Send the response $formats = array('json', 'xml'); $format = !empty($_GET['format']) && in_array($_GET['format'], $formats) ? $_GET['format'] : 'xml'; @@ -168,53 +157,13 @@ class OC_API { return OC_User::login($authuser, $authpw) ? $authuser : false; } - /** - * intelligently merges the different responses - * @param array $responses - * @return array the final merged response - */ - private static function mergeResponses($responses){ - $finalresponse = array( - 'meta' => array( - 'statuscode' => '', - ), - 'data' => array(), - ); - $numresponses = count($responses); - - foreach($responses as $response){ - if(is_int($response['response']) && empty($finalresponse['meta']['statuscode'])){ - $finalresponse['meta']['statuscode'] = $response['response']; - continue; - } - if(is_array($response['response'])){ - // Shipped apps win - if(OC_App::isShipped($response['app'])){ - $finalresponse['data'] = array_merge_recursive($finalresponse['data'], $response['response']); - } else { - $finalresponse['data'] = array_merge_recursive($response['response'], $finalresponse['data']); - } - $finalresponse['meta']['statuscode'] = 100; - } - } - //Some tidying up - if($finalresponse['meta']['statuscode']=='100'){ - $finalresponse['meta']['status'] = 'ok'; - } else { - $finalresponse['meta']['status'] = 'failure'; - } - if(empty($finalresponse['data'])){ - unset($finalresponse['data']); - } - return array('ocs' => $finalresponse); - } - /** * respond to a call - * @param int|array $response the response + * @param int|array $result the result from the api method * @param string $format the format xml|json */ - private static function respond($response, $format='xml'){ + private static function respond($result, $format='xml'){ + $response = array('ocs' => $result->getResult()); if ($format == 'json') { OC_JSON::encodedPrint($response); } else if ($format == 'xml') { diff --git a/lib/ocs/result.php b/lib/ocs/result.php new file mode 100644 index 00000000000..a7199cb5ac7 --- /dev/null +++ b/lib/ocs/result.php @@ -0,0 +1,65 @@ +data = $data; + $this->statuscode = $code; + $this->message = $message; + } + + /** + * sets the statuscode + * @param $code int + */ + public function setCode(int $code){ + $this->statuscode = $code; + } + + /** + * optionally set the total number of items available + * @param $items int + */ + public function setItems(int $items){ + $this->items = $items; + } + + /** + * optionally set the the number of items per page + * @param $items int + */ + public function setItemsPerPage(int $items){ + $this->perpage = $items; + } + + /** + * set a custom message for the response + * @param $message string the message + */ + public function setMessage(string $message){ + $this->message = $message; + } + + /** + * returns the data associated with the api result + * @return array + */ + public function getResult(){ + $return = array(); + $return['meta'] = array(); + $return['meta']['status'] = ($this->statuscode === 100) ? 'ok' : 'failure'; + $return['meta']['statuscode'] = $this->statuscode; + $return['meta']['message'] = $this->message; + $return['data'] = $this->data; + // Return the result data. + return $return; + } + + +} \ No newline at end of file -- cgit v1.2.3 From 2a4b554ca67ba55c75bbff75777285e550dca84f Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Wed, 12 Dec 2012 17:35:58 +0000 Subject: API: OCS methods now use OC_OCS_Result to return data --- lib/ocs/cloud.php | 4 ++-- lib/ocs/config.php | 2 +- lib/ocs/person.php | 6 +++--- lib/ocs/privatedata.php | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/ocs/cloud.php b/lib/ocs/cloud.php index 2f2aad714a3..720cc0ade39 100644 --- a/lib/ocs/cloud.php +++ b/lib/ocs/cloud.php @@ -13,7 +13,7 @@ class OC_OCS_Cloud { $values[] = $newvalue; } } - return $values; + return new OC_OCS_Result($values); } public static function getUserQuota($parameters){ @@ -39,7 +39,7 @@ class OC_OCS_Cloud { $xml['used']=$used; $xml['relative']=$relative; - return $xml; + return new OC_OCS_Result($xml); }else{ return 300; } diff --git a/lib/ocs/config.php b/lib/ocs/config.php index 06103cbeb4f..eb9e470381a 100644 --- a/lib/ocs/config.php +++ b/lib/ocs/config.php @@ -8,6 +8,6 @@ class OC_OCS_Config { $xml['host'] = OCP\Util::getServerHost(); $xml['contact'] = ''; $xml['ssl'] = 'false'; - return $xml; + return new OC_OCS_Result($xml); } } diff --git a/lib/ocs/person.php b/lib/ocs/person.php index 23b8853533d..b5f07d88ae1 100644 --- a/lib/ocs/person.php +++ b/lib/ocs/person.php @@ -8,12 +8,12 @@ class OC_OCS_Person { if($login && $password){ if(OC_User::checkPassword($login,$password)){ $xml['person']['personid'] = $login; - return $xml; + return new OC_OCS_Result($xml); }else{ - return 102; + return new OC_OCS_Result(null, 102); } }else{ - return 101; + return new OC_OCS_Result(null, 101); } } diff --git a/lib/ocs/privatedata.php b/lib/ocs/privatedata.php index 1c781dece8a..02ca31f2d29 100644 --- a/lib/ocs/privatedata.php +++ b/lib/ocs/privatedata.php @@ -14,7 +14,7 @@ class OC_OCS_Privatedata { $xml[$i]['app']=$log['app']; $xml[$i]['value']=$log['value']; } - return $xml; + return new OC_OCS_Result($xml); //TODO: replace 'privatedata' with 'attribute' once a new libattice has been released that works with it } @@ -25,7 +25,7 @@ class OC_OCS_Privatedata { $key = addslashes(strip_tags($parameters['key'])); $value = OC_OCS::readData('post', 'value', 'text'); if(OC_OCS::setData($user,$app,$key,$value)){ - return 100; + return new OC_OCS_Result(null, 100); } } @@ -35,10 +35,10 @@ class OC_OCS_Privatedata { $app = addslashes(strip_tags($parameters['app'])); $key = addslashes(strip_tags($parameters['key'])); if($key=="" or $app==""){ - return; //key and app are NOT optional here + return new OC_OCS_Result(null, 101); //key and app are NOT optional here } if(OC_OCS::deleteData($user,$app,$key)){ - return 100; + return new OC_OCS_Result(null, 100); } } } -- cgit v1.2.3 From 3cc34055368114d81e722adea03a2118e78d2aac Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Wed, 12 Dec 2012 18:06:07 +0000 Subject: API: Remove old code. Move remaining methods to OC_OCS_Result. --- lib/ocs.php | 290 ------------------------------------------------ lib/ocs/cloud.php | 32 +----- lib/ocs/config.php | 1 + lib/ocs/privatedata.php | 6 +- ocs/routes.php | 8 +- 5 files changed, 17 insertions(+), 320 deletions(-) (limited to 'lib') diff --git a/lib/ocs.php b/lib/ocs.php index 1cec3ecc7c0..001965d45e3 100644 --- a/lib/ocs.php +++ b/lib/ocs.php @@ -103,44 +103,6 @@ class OC_OCS { return($txt); } - /** - * checks if the user is authenticated - * checks the IP whitlist, apikeys and login/password combination - * if $forceuser is true and the authentication failed it returns an 401 http response. - * if $forceuser is false and authentification fails it returns an empty username string - * @param bool $forceuser - * @return username string - */ - private static function checkPassword($forceuser=true) { - //valid user account ? - if(isset($_SERVER['PHP_AUTH_USER'])) $authuser=$_SERVER['PHP_AUTH_USER']; else $authuser=''; - if(isset($_SERVER['PHP_AUTH_PW'])) $authpw=$_SERVER['PHP_AUTH_PW']; else $authpw=''; - - if(empty($authuser)) { - if($forceuser) { - header('WWW-Authenticate: Basic realm="your valid user account or api key"'); - header('HTTP/1.0 401 Unauthorized'); - exit; - }else{ - $identifieduser=''; - } - }else{ - if(!OC_User::login($authuser, $authpw)) { - if($forceuser) { - header('WWW-Authenticate: Basic realm="your valid user account or api key"'); - header('HTTP/1.0 401 Unauthorized'); - exit; - }else{ - $identifieduser=''; - } - }else{ - $identifieduser=$authuser; - } - } - - return($identifieduser); - } - /** * generates the xml or json response for the API call from an multidimenional data array. @@ -261,130 +223,6 @@ class OC_OCS { } } - /** - * return the config data of this server - * @param string $format - * @return string xml/json - */ - public static function apiConfig($parameters) { - $format = $parameters['format']; - $user=OC_OCS::checkpassword(false); - $url=substr(OCP\Util::getServerHost().$_SERVER['SCRIPT_NAME'], 0, -11).''; - - $xml['version']='1.7'; - $xml['website']='ownCloud'; - $xml['host']=OCP\Util::getServerHost(); - $xml['contact']=''; - $xml['ssl']='false'; - echo(OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'config', '', 1)); - } - - /** - * check if the provided login/apikey/password is valid - * @param string $format - * @param string $login - * @param string $passwd - * @return string xml/json - */ - private static function personCheck($format,$login,$passwd) { - if($login<>'') { - if(OC_User::login($login, $passwd)) { - $xml['person']['personid']=$login; - echo(OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'person', 'check', 2)); - }else{ - echo(OC_OCS::generatexml($format, 'failed', 102, 'login not valid')); - } - }else{ - echo(OC_OCS::generatexml($format, 'failed', 101, 'please specify all mandatory fields')); - } - } - - // ACTIVITY API ############################################# - - /** - * get my activities - * @param string $format - * @param string $page - * @param string $pagesize - * @return string xml/json - */ - private static function activityGet($format, $page, $pagesize) { - $user=OC_OCS::checkpassword(); - - //TODO - - $txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'activity', 'full', 2, $totalcount,$pagesize); - echo($txt); - } - - /** - * submit a activity - * @param string $format - * @param string $message - * @return string xml/json - */ - private static function activityPut($format,$message) { - // not implemented in ownCloud - $user=OC_OCS::checkpassword(); - echo(OC_OCS::generatexml($format, 'ok', 100, '')); - } - - // PRIVATEDATA API ############################################# - - /** - * get private data and create the xml for ocs - * @param string $format - * @param string $app - * @param string $key - * @return string xml/json - */ - private static function privateDataGet($format, $app="", $key="") { - $user=OC_OCS::checkpassword(); - $result=OC_OCS::getData($user, $app, $key); - $xml=array(); - foreach($result as $i=>$log) { - $xml[$i]['key']=$log['key']; - $xml[$i]['app']=$log['app']; - $xml[$i]['value']=$log['value']; - } - - - $txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'privatedata', 'full', 2, count($xml), 0);//TODO: replace 'privatedata' with 'attribute' once a new libattice has been released that works with it - echo($txt); - } - - /** - * set private data referenced by $key to $value and generate the xml for ocs - * @param string $format - * @param string $app - * @param string $key - * @param string $value - * @return string xml/json - */ - private static function privateDataSet($format, $app, $key, $value) { - $user=OC_OCS::checkpassword(); - if(OC_OCS::setData($user, $app, $key, $value)) { - echo(OC_OCS::generatexml($format, 'ok', 100, '')); - } - } - - /** - * delete private data referenced by $key and generate the xml for ocs - * @param string $format - * @param string $app - * @param string $key - * @return string xml/json - */ - private static function privateDataDelete($format, $app, $key) { - if($key=="" or $app=="") { - return; //key and app are NOT optional here - } - $user=OC_OCS::checkpassword(); - if(OC_OCS::deleteData($user, $app, $key)) { - echo(OC_OCS::generatexml($format, 'ok', 100, '')); - } - } - /** * get private data * @param string $user @@ -416,93 +254,6 @@ class OC_OCS { return $result; } - /** - * set private data referenced by $key to $value - * @param string $user - * @param string $app - * @param string $key - * @param string $value - * @return bool - */ - public static function setData($user, $app, $key, $value) { - return OC_Preferences::setValue($user, $app, $key, $value); - } - - /** - * delete private data referenced by $key - * @param string $user - * @param string $app - * @param string $key - * @return string xml/json - */ - public static function deleteData($user, $app, $key) { - return OC_Preferences::deleteKey($user, $app, $key); - } - - - // CLOUD API ############################################# - - /** - * get a list of installed web apps - * @param string $format - * @return string xml/json - */ - private static function systemWebApps($format) { - $login=OC_OCS::checkpassword(); - $apps=OC_App::getEnabledApps(); - $values=array(); - foreach($apps as $app) { - $info=OC_App::getAppInfo($app); - if(isset($info['standalone'])) { - $newvalue=array('name'=>$info['name'],'url'=>OC_Helper::linkToAbsolute($app,''),'icon'=>''); - $values[]=$newvalue; - } - - } - $txt=OC_OCS::generatexml($format, 'ok', 100, '', $values, 'cloud', '', 2, 0, 0); - echo($txt); - - } - - - /** - * get the quota of a user - * @param string $format - * @param string $user - * @return string xml/json - */ - private static function quotaGet($format,$user) { - $login=OC_OCS::checkpassword(); - if(OC_Group::inGroup($login, 'admin') or ($login==$user)) { - - if(OC_User::userExists($user)) { - // calculate the disc space - $user_dir = '/'.$user.'/files'; - OC_Filesystem::init($user_dir); - $rootInfo=OC_FileCache::get(''); - $sharedInfo=OC_FileCache::get('/Shared'); - $used=$rootInfo['size']-$sharedInfo['size']; - $free=OC_Filesystem::free_space(); - $total=$free+$used; - if($total==0) $total=1; // prevent division by zero - $relative=round(($used/$total)*10000)/100; - - $xml=array(); - $xml['quota']=$total; - $xml['free']=$free; - $xml['used']=$used; - $xml['relative']=$relative; - - $txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'cloud', '', 1, 0, 0); - echo($txt); - }else{ - echo self::generateXml('', 'fail', 300, 'User does not exist'); - } - }else{ - echo self::generateXml('', 'fail', 300, 'You don´t have permission to access this ressource.'); - } - } - /** * set the quota of a user * @param string $format @@ -527,45 +278,4 @@ class OC_OCS { } } - /** - * get the public key of a user - * @param string $format - * @param string $user - * @return string xml/json - */ - private static function publicKeyGet($format,$user) { - $login=OC_OCS::checkpassword(); - - if(OC_User::userExists($user)) { - // calculate the disc space - $txt='this is the public key of '.$user; - echo($txt); - }else{ - echo self::generateXml('', 'fail', 300, 'User does not exist'); - } - } - - /** - * get the private key of a user - * @param string $format - * @param string $user - * @return string xml/json - */ - private static function privateKeyGet($format,$user) { - $login=OC_OCS::checkpassword(); - if(OC_Group::inGroup($login, 'admin') or ($login==$user)) { - - if(OC_User::userExists($user)) { - // calculate the disc space - $txt='this is the private key of '.$user; - echo($txt); - }else{ - echo self::generateXml('', 'fail', 300, 'User does not exist'); - } - }else{ - echo self::generateXml('', 'fail', 300, 'You don´t have permission to access this ressource.'); - } - } - - } diff --git a/lib/ocs/cloud.php b/lib/ocs/cloud.php index 720cc0ade39..b5cfbc295e8 100644 --- a/lib/ocs/cloud.php +++ b/lib/ocs/cloud.php @@ -17,7 +17,6 @@ class OC_OCS_Cloud { } public static function getUserQuota($parameters){ - OC_Util::checkLoggedIn(); $user = OC_User::getUser(); if(OC_Group::inGroup($user, 'admin') or ($user==$parameters['user'])) { @@ -41,44 +40,25 @@ class OC_OCS_Cloud { return new OC_OCS_Result($xml); }else{ - return 300; + return new OC_OCS_Result(null, 300); } }else{ - return 300; - } - } - - public static function setUserQuota($parameters){ - OC_Util::checkLoggedIn(); - $user = OC_User::getUser(); - if(OC_Group::inGroup($user, 'admin')) { - - // todo - // not yet implemented - // add logic here - error_log('OCS call: user:'.$parameters['user'].' quota:'.$parameters['quota']); - - $xml=array(); - return $xml; - }else{ - return 300; + return new OC_OCS_Result(null, 300); } } public static function getUserPublickey($parameters){ - OC_Util::checkLoggedIn(); if(OC_User::userExists($parameters['user'])){ // calculate the disc space // TODO - return array(); + return new OC_OCS_Result(array()); }else{ - return 300; + return new OC_OCS_Result(null, 300); } } public static function getUserPrivatekey($parameters){ - OC_Util::checkLoggedIn(); $user = OC_User::getUser(); if(OC_Group::inGroup($user, 'admin') or ($user==$parameters['user'])) { @@ -87,10 +67,10 @@ class OC_OCS_Cloud { $txt='this is the private key of '.$parameters['user']; echo($txt); }else{ - echo self::generateXml('', 'fail', 300, 'User does not exist'); + return new OC_OCS_Result(null, 300, 'User does not exist'); } }else{ - echo self::generateXml('', 'fail', 300, 'You don´t have permission to access this ressource.'); + return new OC_OCS_Result('null', 300, 'You don´t have permission to access this ressource.'); } } } diff --git a/lib/ocs/config.php b/lib/ocs/config.php index eb9e470381a..52affcd65ee 100644 --- a/lib/ocs/config.php +++ b/lib/ocs/config.php @@ -10,4 +10,5 @@ class OC_OCS_Config { $xml['ssl'] = 'false'; return new OC_OCS_Result($xml); } + } diff --git a/lib/ocs/privatedata.php b/lib/ocs/privatedata.php index 02ca31f2d29..09d636bd733 100644 --- a/lib/ocs/privatedata.php +++ b/lib/ocs/privatedata.php @@ -8,7 +8,7 @@ class OC_OCS_Privatedata { $app = addslashes(strip_tags($parameters['app'])); $key = addslashes(strip_tags($parameters['key'])); $result = OC_OCS::getData($user,$app,$key); - $xml= array(); + $xml = array(); foreach($result as $i=>$log) { $xml[$i]['key']=$log['key']; $xml[$i]['app']=$log['app']; @@ -24,7 +24,7 @@ class OC_OCS_Privatedata { $app = addslashes(strip_tags($parameters['app'])); $key = addslashes(strip_tags($parameters['key'])); $value = OC_OCS::readData('post', 'value', 'text'); - if(OC_OCS::setData($user,$app,$key,$value)){ + if(OC_Preferences::setValue($user,$app,$key,$value)){ return new OC_OCS_Result(null, 100); } } @@ -37,7 +37,7 @@ class OC_OCS_Privatedata { if($key=="" or $app==""){ return new OC_OCS_Result(null, 101); //key and app are NOT optional here } - if(OC_OCS::deleteData($user,$app,$key)){ + if(OC_Preferences::deleteKey($user,$app,$key)){ return new OC_OCS_Result(null, 100); } } diff --git a/ocs/routes.php b/ocs/routes.php index 6b01abe31f2..033d9b79df2 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -10,7 +10,13 @@ OC_API::register('get', '/config', array('OC_OCS_Config', 'apiConfig'), 'ocs', O // Person OC_API::register('post', '/person/check', array('OC_OCS_Person', 'check'), 'ocs', OC_API::GUEST_AUTH); // Activity -OC_API::register('get', '/activity', array('OC_OCS_Activity', 'activityGet'), 'ocs', OC_API::USER_AUTH); +OC_API::register('get', '/activity', array('OC_OCS_Activity', 'activityGet'), 'ocs', OC_API::USER_AUTH); + + +//activity put, keygetpublic, keygetprivate + + + // Privatedata OC_API::register('get', '/privatedata/getattribute', array('OC_OCS_Privatedata', 'get'), 'ocs', OC_API::USER_AUTH, array('app' => '', 'key' => '')); OC_API::register('get', '/privatedata/getattribute/{app}', array('OC_OCS_Privatedata', 'get'), 'ocs', OC_API::USER_AUTH, array('key' => '')); -- cgit v1.2.3 From 228a75ebaa3a8fd543ea473bc23ba0b11a028511 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Wed, 12 Dec 2012 20:58:40 +0000 Subject: API: Include totalitems and itemsperpage meta data when needed. --- lib/ocs/result.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/ocs/result.php b/lib/ocs/result.php index a7199cb5ac7..24029051da5 100644 --- a/lib/ocs/result.php +++ b/lib/ocs/result.php @@ -26,7 +26,7 @@ class OC_OCS_Result{ * optionally set the total number of items available * @param $items int */ - public function setItems(int $items){ + public function setTotalItems(int $items){ $this->items = $items; } @@ -56,6 +56,12 @@ class OC_OCS_Result{ $return['meta']['status'] = ($this->statuscode === 100) ? 'ok' : 'failure'; $return['meta']['statuscode'] = $this->statuscode; $return['meta']['message'] = $this->message; + if(isset($this->items)){ + $return['meta']['totalitems'] = $this->items; + } + if(isset($this->perpage)){ + $return['meta']['itemsperpage'] = $this->perpage; + } $return['data'] = $this->data; // Return the result data. return $return; -- cgit v1.2.3 From 1475ff63ddeb56c277836092d2b02861cb47e4ee Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Wed, 12 Dec 2012 21:04:23 +0000 Subject: API: Add check to see if the user is authorised to run the api method --- lib/api.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index e119b878210..84d1155b594 100644 --- a/lib/api.php +++ b/lib/api.php @@ -86,12 +86,16 @@ class OC_API { parse_str(file_get_contents("php://input"), $_DELETE); } $name = $parameters['_route']; - // Loop through registered actions - if(is_callable(self::$actions[$name]['action'])){ - $response = call_user_func(self::$actions[$name]['action'], $parameters); + // Check authentication and availability + if(self::isAuthorised(self::$actions[$name])){ + if(is_callable(self::$actions[$name]['action'])){ + $response = call_user_func(self::$actions[$name]['action'], $parameters); + } else { + $response = new OC_OCS_Result(null, 998, 'Internal server error'); + } } else { - $response = new OC_OCS_Result(null, 998, 'Internal server error.'); - } + $response = new OC_OCS_Result(null, 997, 'Unauthorised'); + } // Send the response $formats = array('json', 'xml'); $format = !empty($_GET['format']) && in_array($_GET['format'], $formats) ? $_GET['format'] : 'xml'; -- cgit v1.2.3 From 39b51997756ebb233be10ca5a8ced0d6c60d0dac Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Sat, 15 Dec 2012 12:37:44 +0000 Subject: API: PUT and DELETE variables are now accessed from the parameters array --- lib/api.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/api.php b/lib/api.php index 84d1155b594..6c6c351b292 100644 --- a/lib/api.php +++ b/lib/api.php @@ -81,9 +81,9 @@ class OC_API { public static function call($parameters){ // Prepare the request variables if($_SERVER['REQUEST_METHOD'] == 'PUT'){ - parse_str(file_get_contents("php://input"), $_PUT); + parse_str(file_get_contents("php://input"), $parameters['_put']); } else if($_SERVER['REQUEST_METHOD'] == 'DELETE'){ - parse_str(file_get_contents("php://input"), $_DELETE); + parse_str(file_get_contents("php://input"), $parameters['_delete']); } $name = $parameters['_route']; // Check authentication and availability @@ -91,7 +91,7 @@ class OC_API { if(is_callable(self::$actions[$name]['action'])){ $response = call_user_func(self::$actions[$name]['action'], $parameters); } else { - $response = new OC_OCS_Result(null, 998, 'Internal server error'); + $response = new OC_OCS_Result(null, 998, 'Api method not found'); } } else { $response = new OC_OCS_Result(null, 997, 'Unauthorised'); -- cgit v1.2.3 From 1e3231c73220f667446da8627a747eb4b2fe0c63 Mon Sep 17 00:00:00 2001 From: irgsmirx Date: Thu, 20 Dec 2012 12:01:11 +0100 Subject: Update lib/util.php getUrlContent should take proxy setting into consideration when not using curl, as well --- lib/util.php | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/util.php b/lib/util.php index 4170de2125a..98f0d053e32 100755 --- a/lib/util.php +++ b/lib/util.php @@ -688,14 +688,27 @@ class OC_Util { curl_close($curl); } else { - - $ctx = stream_context_create( - array( - 'http' => array( - 'timeout' => 10 - ) - ) - ); + $contextArray = null; + + if(OC_Config::getValue('proxy','')<>'') { + $contextArray = array( + 'http' => array( + 'timeout' => 10, + 'proxy' => OC_Config::getValue('proxy') + ) + ); + } else { + $contextArray = array( + 'http' => array( + 'timeout' => 10 + ) + ); + } + + + $ctx = stream_context_create( + $contextArray + ); $data=@file_get_contents($url, 0, $ctx); } -- cgit v1.2.3 From 986f5d9f3e330f52a068ba916a10ea938a80ad41 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Fri, 21 Dec 2012 00:04:46 +0100 Subject: fixing variable name --- lib/public/util.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/public/util.php b/lib/public/util.php index 9727cfda284..af782b01483 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -202,8 +202,8 @@ class Util { public static function getDefaultEmailAddress($user_part) { $host_name = self::getServerHostName(); // handle localhost installations - if ($server_host === 'localhost') { - $server_host = "example.com"; + if ($host_name === 'localhost') { + $host_name = "example.com"; } return $user_part.'@'.$host_name; } -- cgit v1.2.3 From 7d52c39419123ed3d20368245166e6fc1150975a Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Mon, 24 Dec 2012 00:12:16 +0100 Subject: [tx-robot] updated from transifex --- apps/files/l10n/da.php | 4 + apps/files_external/l10n/da.php | 2 + apps/files_external/l10n/zh_CN.php | 2 + apps/user_webdavauth/l10n/da.php | 4 + apps/user_webdavauth/l10n/sv.php | 2 +- apps/user_webdavauth/l10n/zh_CN.php | 2 +- core/l10n/ar.php | 50 ++++++++++- core/l10n/ca.php | 2 +- core/l10n/da.php | 21 +++++ core/l10n/zh_CN.php | 7 ++ l10n/ar/core.po | 161 ++++++++++++++++++------------------ l10n/ar/lib.po | 30 +++---- l10n/ar/settings.po | 73 ++++++++-------- l10n/ca/core.po | 64 +++++++------- l10n/da/core.po | 107 ++++++++++++------------ l10n/da/files.po | 87 +++++++++---------- l10n/da/files_external.po | 17 ++-- l10n/da/lib.po | 37 +++++---- l10n/da/user_webdavauth.po | 11 +-- l10n/sv/user_webdavauth.po | 8 +- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- l10n/zh_CN/core.po | 79 +++++++++--------- l10n/zh_CN/files_external.po | 17 ++-- l10n/zh_CN/settings.po | 31 +++---- l10n/zh_CN/user_webdavauth.po | 9 +- lib/l10n/ar.php | 5 +- lib/l10n/da.php | 7 +- settings/l10n/ar.php | 33 ++++++++ settings/l10n/zh_CN.php | 12 +++ 38 files changed, 528 insertions(+), 376 deletions(-) create mode 100644 apps/user_webdavauth/l10n/da.php (limited to 'lib') diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php index 24652622c61..05404d27af7 100644 --- a/apps/files/l10n/da.php +++ b/apps/files/l10n/da.php @@ -1,5 +1,6 @@ "Der er ingen fejl, filen blev uploadet med success", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uploadede fil overskrider MAX_FILE_SIZE -direktivet som er specificeret i HTML-formularen", "The uploaded file was only partially uploaded" => "Den uploadede file blev kun delvist uploadet", "No file was uploaded" => "Ingen fil blev uploadet", @@ -18,6 +19,7 @@ "replaced {new_name} with {old_name}" => "erstattede {new_name} med {old_name}", "unshared {files}" => "ikke delte {files}", "deleted {files}" => "slettede {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt.", "generating ZIP-file, it may take some time." => "genererer ZIP-fil, det kan tage lidt tid.", "Unable to upload your file as it is a directory or has 0 bytes" => "Kunne ikke uploade din fil, da det enten er en mappe eller er tom", "Upload Error" => "Fejl ved upload", @@ -27,6 +29,7 @@ "{count} files uploading" => "{count} filer uploades", "Upload cancelled." => "Upload afbrudt.", "File upload is in progress. Leaving the page now will cancel the upload." => "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud", "{count} files scanned" => "{count} filer skannet", "error while scanning" => "fejl under scanning", "Name" => "Navn", @@ -47,6 +50,7 @@ "New" => "Ny", "Text file" => "Tekstfil", "Folder" => "Mappe", +"From link" => "Fra link", "Upload" => "Upload", "Cancel upload" => "Fortryd upload", "Nothing in here. Upload something!" => "Her er tomt. Upload noget!", diff --git a/apps/files_external/l10n/da.php b/apps/files_external/l10n/da.php index 00a81f3da16..bae89a6cfdd 100644 --- a/apps/files_external/l10n/da.php +++ b/apps/files_external/l10n/da.php @@ -5,6 +5,8 @@ "Fill out all required fields" => "Udfyld alle nødvendige felter", "Please provide a valid Dropbox app key and secret." => "Angiv venligst en valid Dropbox app nøgle og hemmelighed", "Error configuring Google Drive storage" => "Fejl ved konfiguration af Google Drive plads", +"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => " Advarsel: \"smbclient\" ikke er installeret. Montering af CIFS / SMB delinger er ikke muligt. Spørg din systemadministrator om at installere det.", +"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." => " Advarsel: FTP-understøttelse i PHP ikke er aktiveret eller installeret. Montering af FTP delinger er ikke muligt. Spørg din systemadministrator om at installere det.", "External Storage" => "Ekstern opbevaring", "Mount point" => "Monteringspunkt", "Backend" => "Backend", diff --git a/apps/files_external/l10n/zh_CN.php b/apps/files_external/l10n/zh_CN.php index 247ef7ce95c..1bb88564630 100644 --- a/apps/files_external/l10n/zh_CN.php +++ b/apps/files_external/l10n/zh_CN.php @@ -5,6 +5,8 @@ "Fill out all required fields" => "完成所有必填项", "Please provide a valid Dropbox app key and secret." => "请提供有效的Dropbox应用key和secret", "Error configuring Google Drive storage" => "配置Google Drive存储时出错", +"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "警告：“smbclient” 尚未安装。CIFS/SMB 分享挂载无法实现。请咨询系统管理员进行安装。", +"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." => "警告：PHP中尚未启用或安装FTP。FTP 分享挂载无法实现。请咨询系统管理员进行安装。", "External Storage" => "外部存储", "Mount point" => "挂载点", "Backend" => "后端", diff --git a/apps/user_webdavauth/l10n/da.php b/apps/user_webdavauth/l10n/da.php new file mode 100644 index 00000000000..7d9ee1d5b29 --- /dev/null +++ b/apps/user_webdavauth/l10n/da.php @@ -0,0 +1,4 @@ + "URL: http://", +"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud vil sende brugeroplysningerne til denne webadresse er fortolker http 401 og http 403 som brugeroplysninger forkerte og alle andre koder som brugeroplysninger korrekte." +); diff --git a/apps/user_webdavauth/l10n/sv.php b/apps/user_webdavauth/l10n/sv.php index 9bd32954b05..245a5101341 100644 --- a/apps/user_webdavauth/l10n/sv.php +++ b/apps/user_webdavauth/l10n/sv.php @@ -1,3 +1,3 @@ "WebDAV URL: http://" +"URL: http://" => "URL: http://" ); diff --git a/apps/user_webdavauth/l10n/zh_CN.php b/apps/user_webdavauth/l10n/zh_CN.php index 33c77f7d30e..5b06409b42e 100644 --- a/apps/user_webdavauth/l10n/zh_CN.php +++ b/apps/user_webdavauth/l10n/zh_CN.php @@ -1,3 +1,3 @@ "WebDAV地址: http://" +"URL: http://" => "URL：http://" ); diff --git a/core/l10n/ar.php b/core/l10n/ar.php index 80a22a248e6..d33de577b3d 100644 --- a/core/l10n/ar.php +++ b/core/l10n/ar.php @@ -1,10 +1,48 @@ "ألا توجد فئة للإضافة؟", +"This category already exists: " => "هذه الفئة موجودة مسبقاً", +"No categories selected for deletion." => "لم يتم اختيار فئة للحذف", "Settings" => "تعديلات", +"seconds ago" => "منذ ثواني", +"1 minute ago" => "منذ دقيقة", +"{minutes} minutes ago" => "{minutes} منذ دقائق", +"today" => "اليوم", +"Choose" => "اختيار", "Cancel" => "الغاء", +"No" => "لا", +"Yes" => "نعم", +"Ok" => "موافق", +"Error" => "خطأ", +"Error while sharing" => "حصل خطأ عند عملية المشاركة", +"Error while unsharing" => "حصل خطأ عند عملية إزالة المشاركة", +"Error while changing permissions" => "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل", +"Shared with you and the group {group} by {owner}" => "شورك معك ومع المجموعة {group} من قبل {owner}", +"Shared with you by {owner}" => "شورك معك من قبل {owner}", +"Share with" => "شارك مع", +"Share with link" => "شارك مع رابط", +"Password protect" => "حماية كلمة السر", "Password" => "كلمة السر", +"Set expiration date" => "تعيين تاريخ إنتهاء الصلاحية", +"Expiration date" => "تاريخ إنتهاء الصلاحية", +"Share via email:" => "مشاركة عبر البريد الإلكتروني:", +"No people found" => "لم يتم العثور على أي شخص", +"Resharing is not allowed" => "لا يسمح بعملية إعادة المشاركة", +"Shared in {item} with {user}" => "شورك في {item} مع {user}", "Unshare" => "إلغاء مشاركة", +"can edit" => "التحرير مسموح", +"access control" => "ضبط الوصول", +"create" => "إنشاء", +"update" => "تحديث", +"delete" => "حذف", +"share" => "مشاركة", +"Password protected" => "محمي بكلمة السر", +"Error unsetting expiration date" => "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية", +"Error setting expiration date" => "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية", +"ownCloud password reset" => "إعادة تعيين كلمة سر ownCloud", "Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}", "You will receive a link to reset your password via Email." => "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.", +"Reset email send." => "إعادة إرسال البريد الإلكتروني.", +"Request failed!" => "فشل الطلب", "Username" => "إسم المستخدم", "Request reset" => "طلب تعديل", "Your password was reset" => "لقد تم تعديل كلمة السر", @@ -16,9 +54,12 @@ "Apps" => "التطبيقات", "Admin" => "مستخدم رئيسي", "Help" => "المساعدة", +"Access forbidden" => "التوصّل محظور", "Cloud not found" => "لم يتم إيجاد", "Edit categories" => "عدل الفئات", "Add" => "أدخل", +"Security Warning" => "تحذير أمان", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "لا يوجد مولّد أرقام عشوائية ، الرجاء تفعيل الـ PHP OpenSSL extension.", "Create an admin account" => "أضف مستخدم رئيسي ", "Advanced" => "خيارات متقدمة", "Data folder" => "مجلد المعلومات", @@ -27,6 +68,7 @@ "Database user" => "مستخدم قاعدة البيانات", "Database password" => "كلمة سر مستخدم قاعدة البيانات", "Database name" => "إسم قاعدة البيانات", +"Database tablespace" => "مساحة جدول قاعدة البيانات", "Database host" => "خادم قاعدة البيانات", "Finish setup" => "انهاء التعديلات", "Sunday" => "الاحد", @@ -50,10 +92,16 @@ "December" => "كانون الاول", "web services under your control" => "خدمات الوب تحت تصرفك", "Log out" => "الخروج", +"Automatic logon rejected!" => "تم رفض تسجيل الدخول التلقائي!", +"If you did not change your password recently, your account may be compromised!" => "قد يكون حسابك في خطر إن لم تقم بإعادة تعيين كلمة السر حديثاً", +"Please change your password to secure your account again." => "الرجاء إعادة تعيين كلمة السر لتأمين حسابك.", "Lost your password?" => "هل نسيت كلمة السر؟", "remember" => "تذكر", "Log in" => "أدخل", "You are logged out." => "تم الخروج بنجاح.", "prev" => "السابق", -"next" => "التالي" +"next" => "التالي", +"Security Warning!" => "تحذير أمان!", +"Please verify your password.
For security reasons you may be occasionally asked to enter your password again." => "الرجاء التحقق من كلمة السر.
من الممكن أحياناً أن نطلب منك إعادة إدخال كلمة السر مرة أخرى.", +"Verify" => "تحقيق" ); diff --git a/core/l10n/ca.php b/core/l10n/ca.php index cf7cdfb7c94..f98922f8f38 100644 --- a/core/l10n/ca.php +++ b/core/l10n/ca.php @@ -33,7 +33,7 @@ "The object type is not specified." => "No s'ha especificat el tipus d'objecte.", "Error" => "Error", "The app name is not specified." => "No s'ha especificat el nom de l'aplicació.", -"The required file {file} is not installed!" => "El figtxer requerit {file} no està instal·lat!", +"The required file {file} is not installed!" => "El fitxer requerit {file} no està instal·lat!", "Error while sharing" => "Error en compartir", "Error while unsharing" => "Error en deixar de compartir", "Error while changing permissions" => "Error en canviar els permisos", diff --git a/core/l10n/da.php b/core/l10n/da.php index 2798b22830f..a792e1d9bae 100644 --- a/core/l10n/da.php +++ b/core/l10n/da.php @@ -1,15 +1,27 @@ "Bruger %s delte en fil med dig", +"User %s shared a folder with you" => "Bruger %s delte en mappe med dig", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Bruger %s delte filen \"%s\" med dig. Den kan hentes her: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Bruger %s delte mappe \"%s\" med dig. Det kan hentes her: %s", +"Category type not provided." => "Kategori typen ikke er fastsat.", "No category to add?" => "Ingen kategori at tilføje?", "This category already exists: " => "Denne kategori eksisterer allerede: ", +"Object type not provided." => "Object type ikke er fastsat.", +"%s ID not provided." => "%s ID ikke oplyst.", +"Error adding %s to favorites." => "Fejl ved tilføjelse af %s til favoritter.", "No categories selected for deletion." => "Ingen kategorier valgt", +"Error removing %s from favorites." => "Fejl ved fjernelse af %s fra favoritter.", "Settings" => "Indstillinger", "seconds ago" => "sekunder siden", "1 minute ago" => "1 minut siden", "{minutes} minutes ago" => "{minutes} minutter siden", +"1 hour ago" => "1 time siden", +"{hours} hours ago" => "{hours} timer siden", "today" => "i dag", "yesterday" => "i går", "{days} days ago" => "{days} dage siden", "last month" => "sidste måned", +"{months} months ago" => "{months} måneder siden", "months ago" => "måneder siden", "last year" => "sidste år", "years ago" => "år siden", @@ -18,7 +30,10 @@ "No" => "Nej", "Yes" => "Ja", "Ok" => "OK", +"The object type is not specified." => "Objekttypen er ikke angivet.", "Error" => "Fejl", +"The app name is not specified." => "Den app navn er ikke angivet.", +"The required file {file} is not installed!" => "Den krævede fil {file} er ikke installeret!", "Error while sharing" => "Fejl under deling", "Error while unsharing" => "Fejl under annullering af deling", "Error while changing permissions" => "Fejl under justering af rettigheder", @@ -28,6 +43,8 @@ "Share with link" => "Del med link", "Password protect" => "Beskyt med adgangskode", "Password" => "Kodeord", +"Email link to person" => "E-mail link til person", +"Send" => "Send", "Set expiration date" => "Vælg udløbsdato", "Expiration date" => "Udløbsdato", "Share via email:" => "Del via email:", @@ -44,9 +61,13 @@ "Password protected" => "Beskyttet med adgangskode", "Error unsetting expiration date" => "Fejl ved fjernelse af udløbsdato", "Error setting expiration date" => "Fejl under sætning af udløbsdato", +"Sending ..." => "Sender ...", +"Email sent" => "E-mail afsendt", "ownCloud password reset" => "Nulstil ownCloud kodeord", "Use the following link to reset your password: {link}" => "Anvend følgende link til at nulstille din adgangskode: {link}", "You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.", +"Reset email send." => "Reset-mail afsendt.", +"Request failed!" => "Anmodningen mislykkedes!", "Username" => "Brugernavn", "Request reset" => "Anmod om nulstilling", "Your password was reset" => "Dit kodeord blev nulstillet", diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php index a83382904d3..64b108ca1dd 100644 --- a/core/l10n/zh_CN.php +++ b/core/l10n/zh_CN.php @@ -1,4 +1,8 @@ "用户 %s 与您共享了一个文件", +"User %s shared a folder with you" => "用户 %s 与您共享了一个文件夹", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "用户 %s 与您共享了文件\"%s\"。文件下载地址：%s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "用户 %s 与您共享了文件夹\"%s\"。文件夹下载地址：%s", "Category type not provided." => "未提供分类类型。", "No category to add?" => "没有可添加分类？", "This category already exists: " => "此分类已存在: ", @@ -39,6 +43,7 @@ "Share with link" => "共享链接", "Password protect" => "密码保护", "Password" => "密码", +"Send" => "发送", "Set expiration date" => "设置过期日期", "Expiration date" => "过期日期", "Share via email:" => "通过Email共享", @@ -55,6 +60,8 @@ "Password protected" => "密码已受保护", "Error unsetting expiration date" => "取消设置过期日期时出错", "Error setting expiration date" => "设置过期日期时出错", +"Sending ..." => "正在发送...", +"Email sent" => "邮件已发送", "ownCloud password reset" => "重置 ownCloud 密码", "Use the following link to reset your password: {link}" => "使用以下链接重置您的密码：{link}", "You will receive a link to reset your password via Email." => "您将会收到包含可以重置密码链接的邮件。", diff --git a/l10n/ar/core.po b/l10n/ar/core.po index 4671747f750..0785bd05e65 100644 --- a/l10n/ar/core.po +++ b/l10n/ar/core.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. # , 2011, 2012. 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-12 23:17+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-24 00:10+0100\n" +"PO-Revision-Date: 2012-12-23 19:06+0000\n" +"Last-Translator: aboodilankaboot \n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -48,11 +49,11 @@ msgstr "" #: ajax/vcategories/add.php:30 msgid "No category to add?" -msgstr "" +msgstr "ألا توجد فئة للإضافة؟" #: ajax/vcategories/add.php:37 msgid "This category already exists: " -msgstr "" +msgstr "هذه الفئة موجودة مسبقاً" #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27 #: ajax/vcategories/favorites.php:24 @@ -73,7 +74,7 @@ msgstr "" #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 msgid "No categories selected for deletion." -msgstr "" +msgstr "لم يتم اختيار فئة للحذف" #: ajax/vcategories/removeFromFavorites.php:35 #, php-format @@ -86,15 +87,15 @@ msgstr "تعديلات" #: js/js.js:704 msgid "seconds ago" -msgstr "" +msgstr "منذ ثواني" #: js/js.js:705 msgid "1 minute ago" -msgstr "" +msgstr "منذ دقيقة" #: js/js.js:706 msgid "{minutes} minutes ago" -msgstr "" +msgstr "{minutes} منذ دقائق" #: js/js.js:707 msgid "1 hour ago" @@ -106,7 +107,7 @@ msgstr "" #: js/js.js:709 msgid "today" -msgstr "" +msgstr "اليوم" #: js/js.js:710 msgid "yesterday" @@ -138,7 +139,7 @@ msgstr "" #: js/oc-dialogs.js:126 msgid "Choose" -msgstr "" +msgstr "اختيار" #: js/oc-dialogs.js:146 js/oc-dialogs.js:166 msgid "Cancel" @@ -146,15 +147,15 @@ msgstr "الغاء" #: js/oc-dialogs.js:162 msgid "No" -msgstr "" +msgstr "لا" #: js/oc-dialogs.js:163 msgid "Yes" -msgstr "" +msgstr "نعم" #: js/oc-dialogs.js:180 msgid "Ok" -msgstr "" +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 @@ -162,10 +163,10 @@ 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:135 js/share.js:142 js/share.js:541 -#: js/share.js:553 +#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554 +#: js/share.js:566 msgid "Error" -msgstr "" +msgstr "خطأ" #: js/oc-vcategories.js:179 msgid "The app name is not specified." @@ -175,39 +176,39 @@ msgstr "" msgid "The required file {file} is not installed!" msgstr "" -#: js/share.js:124 js/share.js:581 +#: js/share.js:124 js/share.js:594 msgid "Error while sharing" -msgstr "" +msgstr "حصل خطأ عند عملية المشاركة" #: js/share.js:135 msgid "Error while unsharing" -msgstr "" +msgstr "حصل خطأ عند عملية إزالة المشاركة" #: js/share.js:142 msgid "Error while changing permissions" -msgstr "" +msgstr "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل" #: js/share.js:151 msgid "Shared with you and the group {group} by {owner}" -msgstr "" +msgstr "شورك معك ومع المجموعة {group} من قبل {owner}" #: js/share.js:153 msgid "Shared with you by {owner}" -msgstr "" +msgstr "شورك معك من قبل {owner}" #: js/share.js:158 msgid "Share with" -msgstr "" +msgstr "شارك مع" #: js/share.js:163 msgid "Share with link" -msgstr "" +msgstr "شارك مع رابط" -#: js/share.js:164 +#: js/share.js:166 msgid "Password protect" -msgstr "" +msgstr "حماية كلمة السر" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:35 #: templates/verify.php:13 msgid "Password" msgstr "كلمة السر" @@ -222,27 +223,27 @@ msgstr "" #: js/share.js:177 msgid "Set expiration date" -msgstr "" +msgstr "تعيين تاريخ إنتهاء الصلاحية" #: js/share.js:178 msgid "Expiration date" -msgstr "" +msgstr "تاريخ إنتهاء الصلاحية" #: js/share.js:210 msgid "Share via email:" -msgstr "" +msgstr "مشاركة عبر البريد الإلكتروني:" #: js/share.js:212 msgid "No people found" -msgstr "" +msgstr "لم يتم العثور على أي شخص" #: js/share.js:239 msgid "Resharing is not allowed" -msgstr "" +msgstr "لا يسمح بعملية إعادة المشاركة" #: js/share.js:275 msgid "Shared in {item} with {user}" -msgstr "" +msgstr "شورك في {item} مع {user}" #: js/share.js:296 msgid "Unshare" @@ -250,51 +251,51 @@ msgstr "إلغاء مشاركة" #: js/share.js:308 msgid "can edit" -msgstr "" +msgstr "التحرير مسموح" #: js/share.js:310 msgid "access control" -msgstr "" +msgstr "ضبط الوصول" #: js/share.js:313 msgid "create" -msgstr "" +msgstr "إنشاء" #: js/share.js:316 msgid "update" -msgstr "" +msgstr "تحديث" #: js/share.js:319 msgid "delete" -msgstr "" +msgstr "حذف" #: js/share.js:322 msgid "share" -msgstr "" +msgstr "مشاركة" -#: js/share.js:353 js/share.js:528 js/share.js:530 +#: js/share.js:356 js/share.js:541 msgid "Password protected" -msgstr "" +msgstr "محمي بكلمة السر" -#: js/share.js:541 +#: js/share.js:554 msgid "Error unsetting expiration date" -msgstr "" +msgstr "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية" -#: js/share.js:553 +#: js/share.js:566 msgid "Error setting expiration date" -msgstr "" +msgstr "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية" -#: js/share.js:568 +#: js/share.js:581 msgid "Sending ..." msgstr "" -#: js/share.js:579 +#: js/share.js:592 msgid "Email sent" msgstr "" #: lostpassword/controller.php:47 msgid "ownCloud password reset" -msgstr "" +msgstr "إعادة تعيين كلمة سر ownCloud" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" @@ -306,14 +307,14 @@ msgstr "سوف نرسل لك بريد يحتوي على وصلة لتجديد ك #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "إعادة إرسال البريد الإلكتروني." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "فشل الطلب" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:28 msgid "Username" msgstr "إسم المستخدم" @@ -359,7 +360,7 @@ msgstr "المساعدة" #: templates/403.php:12 msgid "Access forbidden" -msgstr "" +msgstr "التوصّل محظور" #: templates/404.php:12 msgid "Cloud not found" @@ -375,13 +376,13 @@ msgstr "أدخل" #: templates/installation.php:23 templates/installation.php:31 msgid "Security Warning" -msgstr "" +msgstr "تحذير أمان" #: templates/installation.php:24 msgid "" "No secure random number generator is available, please enable the PHP " "OpenSSL extension." -msgstr "" +msgstr "لا يوجد مولّد أرقام عشوائية ، الرجاء تفعيل الـ PHP OpenSSL extension." #: templates/installation.php:26 msgid "" @@ -402,44 +403,44 @@ msgstr "" msgid "Create an admin account" msgstr "أضف مستخدم رئيسي " -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" msgstr "خيارات متقدمة" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" msgstr "مجلد المعلومات" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" msgstr "أسس قاعدة البيانات" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" msgstr "سيتم استخدمه" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" msgstr "مستخدم قاعدة البيانات" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" msgstr "كلمة سر مستخدم قاعدة البيانات" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" msgstr "إسم قاعدة البيانات" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" -msgstr "" +msgstr "مساحة جدول قاعدة البيانات" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" msgstr "خادم قاعدة البيانات" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" msgstr "انهاء التعديلات" @@ -527,29 +528,29 @@ msgstr "خدمات الوب تحت تصرفك" msgid "Log out" msgstr "الخروج" -#: templates/login.php:8 +#: templates/login.php:10 msgid "Automatic logon rejected!" -msgstr "" +msgstr "تم رفض تسجيل الدخول التلقائي!" -#: templates/login.php:9 +#: templates/login.php:11 msgid "" "If you did not change your password recently, your account may be " "compromised!" -msgstr "" +msgstr "قد يكون حسابك في خطر إن لم تقم بإعادة تعيين كلمة السر حديثاً" -#: templates/login.php:10 +#: templates/login.php:13 msgid "Please change your password to secure your account again." -msgstr "" +msgstr "الرجاء إعادة تعيين كلمة السر لتأمين حسابك." -#: templates/login.php:15 +#: templates/login.php:19 msgid "Lost your password?" msgstr "هل نسيت كلمة السر؟" -#: templates/login.php:27 +#: templates/login.php:39 msgid "remember" msgstr "تذكر" -#: templates/login.php:28 +#: templates/login.php:41 msgid "Log in" msgstr "أدخل" @@ -567,14 +568,14 @@ msgstr "التالي" #: templates/verify.php:5 msgid "Security Warning!" -msgstr "" +msgstr "تحذير أمان!" #: templates/verify.php:6 msgid "" "Please verify your password.
For security reasons you may be " "occasionally asked to enter your password again." -msgstr "" +msgstr "الرجاء التحقق من كلمة السر.
من الممكن أحياناً أن نطلب منك إعادة إدخال كلمة السر مرة أخرى." #: templates/verify.php:16 msgid "Verify" -msgstr "" +msgstr "تحقيق" diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po index fc9b90e3d69..6a9cdf2b15b 100644 --- a/l10n/ar/lib.po +++ b/l10n/ar/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-16 00:02+0100\n" -"PO-Revision-Date: 2012-11-14 23:13+0000\n" +"POT-Creation-Date: 2012-12-24 00:11+0100\n" +"PO-Revision-Date: 2012-12-23 19:00+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,43 +17,43 @@ 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" -#: app.php:285 +#: app.php:287 msgid "Help" msgstr "المساعدة" -#: app.php:292 +#: app.php:294 msgid "Personal" msgstr "شخصي" -#: app.php:297 +#: app.php:299 msgid "Settings" msgstr "تعديلات" -#: app.php:302 +#: app.php:304 msgid "Users" msgstr "المستخدمين" -#: app.php:309 +#: app.php:311 msgid "Apps" msgstr "" -#: app.php:311 +#: app.php:313 msgid "Admin" msgstr "" -#: files.php:332 +#: files.php:365 msgid "ZIP download is turned off." msgstr "" -#: files.php:333 +#: files.php:366 msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:333 files.php:358 +#: files.php:366 files.php:391 msgid "Back to Files" msgstr "" -#: files.php:357 +#: files.php:390 msgid "Selected files too large to generate zip file." msgstr "" @@ -83,11 +83,11 @@ msgstr "" #: template.php:103 msgid "seconds ago" -msgstr "" +msgstr "منذ ثواني" #: template.php:104 msgid "1 minute ago" -msgstr "" +msgstr "منذ دقيقة" #: template.php:105 #, php-format @@ -105,7 +105,7 @@ msgstr "" #: template.php:108 msgid "today" -msgstr "" +msgstr "اليوم" #: template.php:109 msgid "yesterday" diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po index 0681094b946..e3ac2066d0d 100644 --- a/l10n/ar/settings.po +++ b/l10n/ar/settings.po @@ -4,14 +4,15 @@ # # Translators: # , 2012. +# , 2012. # , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-23 00:09+0100\n" -"PO-Revision-Date: 2012-12-22 19:51+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-24 00:11+0100\n" +"PO-Revision-Date: 2012-12-23 18:36+0000\n" +"Last-Translator: aboodilankaboot \n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,27 +22,27 @@ msgstr "" #: ajax/apps/ocs.php:20 msgid "Unable to load list from App Store" -msgstr "" +msgstr "فشل تحميل القائمة من الآب ستور" #: ajax/creategroup.php:10 msgid "Group already exists" -msgstr "" +msgstr "المجموعة موجودة مسبقاً" #: ajax/creategroup.php:19 msgid "Unable to add group" -msgstr "" +msgstr "فشل إضافة المجموعة" #: ajax/enableapp.php:12 msgid "Could not enable app. " -msgstr "" +msgstr "فشل عملية تفعيل التطبيق" #: ajax/lostpassword.php:12 msgid "Email saved" -msgstr "" +msgstr "تم حفظ البريد الإلكتروني" #: ajax/lostpassword.php:14 msgid "Invalid email" -msgstr "" +msgstr "البريد الإلكتروني غير صالح" #: ajax/openid.php:13 msgid "OpenID Changed" @@ -53,7 +54,7 @@ msgstr "طلبك غير مفهوم" #: ajax/removegroup.php:13 msgid "Unable to delete group" -msgstr "" +msgstr "فشل إزالة المجموعة" #: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18 msgid "Authentication error" @@ -61,7 +62,7 @@ msgstr "لم يتم التأكد من الشخصية بنجاح" #: ajax/removeuser.php:24 msgid "Unable to delete user" -msgstr "" +msgstr "فشل إزالة المستخدم" #: ajax/setlanguage.php:15 msgid "Language changed" @@ -69,21 +70,21 @@ msgstr "تم تغيير اللغة" #: ajax/togglegroups.php:12 msgid "Admins can't remove themself from the admin group" -msgstr "" +msgstr "لا يستطيع المدير إزالة حسابه من مجموعة المديرين" #: ajax/togglegroups.php:28 #, php-format msgid "Unable to add user to group %s" -msgstr "" +msgstr "فشل إضافة المستخدم الى المجموعة %s" #: ajax/togglegroups.php:34 #, php-format msgid "Unable to remove user from group %s" -msgstr "" +msgstr "فشل إزالة المستخدم من المجموعة %s" #: js/apps.js:28 js/apps.js:67 msgid "Disable" -msgstr "" +msgstr "إيقاف" #: js/apps.js:28 js/apps.js:55 msgid "Enable" @@ -99,11 +100,11 @@ msgstr "__language_name__" #: templates/apps.php:10 msgid "Add your App" -msgstr "" +msgstr "أضف تطبيقاتك" #: templates/apps.php:11 msgid "More Apps" -msgstr "" +msgstr "المزيد من التطبيقات" #: templates/apps.php:27 msgid "Select an App" @@ -111,40 +112,40 @@ msgstr "إختر تطبيقاً" #: templates/apps.php:31 msgid "See application page at apps.owncloud.com" -msgstr "" +msgstr "راجع صفحة التطبيق على apps.owncloud.com" #: templates/apps.php:32 msgid "-licensed by " -msgstr "" +msgstr "-ترخيص من قبل " #: templates/help.php:3 msgid "User Documentation" -msgstr "" +msgstr "كتاب توثيق المستخدم" #: templates/help.php:4 msgid "Administrator Documentation" -msgstr "" +msgstr "كتاب توثيق المدير" #: templates/help.php:6 msgid "Online Documentation" -msgstr "" +msgstr "توثيق متوفر على الشبكة" #: templates/help.php:7 msgid "Forum" -msgstr "" +msgstr "منتدى" #: templates/help.php:9 msgid "Bugtracker" -msgstr "" +msgstr "تعقب علة" #: templates/help.php:11 msgid "Commercial Support" -msgstr "" +msgstr "دعم تجاري" #: templates/personal.php:8 #, php-format msgid "You have used %s of the available %s" -msgstr "" +msgstr "تم إستهلاك %s من المتوفر %s" #: templates/personal.php:12 msgid "Clients" @@ -152,15 +153,15 @@ msgstr "الزبائن" #: templates/personal.php:13 msgid "Download Desktop Clients" -msgstr "" +msgstr "تحميل عملاء سطح المكتب" #: templates/personal.php:14 msgid "Download Android Client" -msgstr "" +msgstr "تحميل عميل آندرويد" #: templates/personal.php:15 msgid "Download iOS Client" -msgstr "" +msgstr "تحميل عميل آي أو أس" #: templates/personal.php:21 templates/users.php:23 templates/users.php:77 msgid "Password" @@ -168,7 +169,7 @@ msgstr "كلمات السر" #: templates/personal.php:22 msgid "Your password was changed" -msgstr "" +msgstr "لقد تم تغيير كلمة السر" #: templates/personal.php:23 msgid "Unable to change your password" @@ -212,15 +213,15 @@ msgstr "ساعد في الترجمه" #: templates/personal.php:52 msgid "WebDAV" -msgstr "" +msgstr "WebDAV" #: templates/personal.php:54 msgid "Use this address to connect to your ownCloud in your file manager" -msgstr "" +msgstr "إستخدم هذا العنوان للإتصال بـ ownCloud في مدير الملفات" #: templates/personal.php:63 msgid "Version" -msgstr "" +msgstr "إصدار" #: templates/personal.php:65 msgid "" @@ -230,7 +231,7 @@ msgid "" "licensed under the AGPL." -msgstr "" +msgstr "طوّر من قبل ownCloud مجتمع, الـ النص المصدري مرخص بموجب رخصة أفيرو العمومية." #: templates/users.php:21 templates/users.php:76 msgid "Name" @@ -246,7 +247,7 @@ msgstr "انشئ" #: templates/users.php:35 msgid "Default Quota" -msgstr "" +msgstr "الحصة النسبية الإفتراضية" #: templates/users.php:55 templates/users.php:138 msgid "Other" @@ -254,7 +255,7 @@ msgstr "شيء آخر" #: templates/users.php:80 templates/users.php:112 msgid "Group Admin" -msgstr "" +msgstr "مدير المجموعة" #: templates/users.php:82 msgid "Quota" diff --git a/l10n/ca/core.po b/l10n/ca/core.po index 0ce863841d7..9fd20a8ef12 100644 --- a/l10n/ca/core.po +++ b/l10n/ca/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-14 00:16+0100\n" -"PO-Revision-Date: 2012-12-13 09:48+0000\n" +"POT-Creation-Date: 2012-12-24 00:10+0100\n" +"PO-Revision-Date: 2012-12-23 14:22+0000\n" "Last-Translator: rogerc \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" @@ -163,8 +163,8 @@ msgid "The object type is not specified." msgstr "No s'ha especificat el tipus d'objecte." #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 -#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541 -#: js/share.js:553 +#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554 +#: js/share.js:566 msgid "Error" msgstr "Error" @@ -174,9 +174,9 @@ msgstr "No s'ha especificat el nom de l'aplicació." #: js/oc-vcategories.js:194 msgid "The required file {file} is not installed!" -msgstr "El figtxer requerit {file} no està instal·lat!" +msgstr "El fitxer requerit {file} no està instal·lat!" -#: js/share.js:124 js/share.js:581 +#: js/share.js:124 js/share.js:594 msgid "Error while sharing" msgstr "Error en compartir" @@ -204,11 +204,11 @@ msgstr "Comparteix amb" msgid "Share with link" msgstr "Comparteix amb enllaç" -#: js/share.js:164 +#: js/share.js:166 msgid "Password protect" msgstr "Protegir amb contrasenya" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:35 #: templates/verify.php:13 msgid "Password" msgstr "Contrasenya" @@ -273,23 +273,23 @@ msgstr "elimina" msgid "share" msgstr "comparteix" -#: js/share.js:353 js/share.js:528 js/share.js:530 +#: js/share.js:356 js/share.js:541 msgid "Password protected" msgstr "Protegeix amb contrasenya" -#: js/share.js:541 +#: js/share.js:554 msgid "Error unsetting expiration date" msgstr "Error en eliminar la data d'expiració" -#: js/share.js:553 +#: js/share.js:566 msgid "Error setting expiration date" msgstr "Error en establir la data d'expiració" -#: js/share.js:568 +#: js/share.js:581 msgid "Sending ..." msgstr "Enviant..." -#: js/share.js:579 +#: js/share.js:592 msgid "Email sent" msgstr "El correu electrónic s'ha enviat" @@ -313,8 +313,8 @@ msgstr "S'ha enviat el correu reinicialització" msgid "Request failed!" msgstr "El requeriment ha fallat!" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:28 msgid "Username" msgstr "Nom d'usuari" @@ -403,44 +403,44 @@ msgstr "La carpeta de dades i els fitxers provablement són accessibles des d'in msgid "Create an admin account" msgstr "Crea un compte d'administrador" -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" msgstr "Avançat" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" msgstr "Carpeta de dades" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" msgstr "Configura la base de dades" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" msgstr "s'usarà" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" msgstr "Usuari de la base de dades" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" msgstr "Contrasenya de la base de dades" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" msgstr "Nom de la base de dades" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" msgstr "Espai de taula de la base de dades" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" msgstr "Ordinador central de la base de dades" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" msgstr "Acaba la configuració" @@ -528,29 +528,29 @@ msgstr "controleu els vostres serveis web" msgid "Log out" msgstr "Surt" -#: templates/login.php:8 +#: templates/login.php:10 msgid "Automatic logon rejected!" msgstr "L'ha rebutjat l'acceditació automàtica!" -#: templates/login.php:9 +#: templates/login.php:11 msgid "" "If you did not change your password recently, your account may be " "compromised!" msgstr "Se no heu canviat la contrasenya recentment el vostre compte pot estar compromès!" -#: templates/login.php:10 +#: templates/login.php:13 msgid "Please change your password to secure your account again." msgstr "Canvieu la contrasenya de nou per assegurar el vostre compte." -#: templates/login.php:15 +#: templates/login.php:19 msgid "Lost your password?" msgstr "Heu perdut la contrasenya?" -#: templates/login.php:27 +#: templates/login.php:39 msgid "remember" msgstr "recorda'm" -#: templates/login.php:28 +#: templates/login.php:41 msgid "Log in" msgstr "Inici de sessió" diff --git a/l10n/da/core.po b/l10n/da/core.po index 01fdc7642c0..6fa46250122 100644 --- a/l10n/da/core.po +++ b/l10n/da/core.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. # , 2011, 2012. # Morten Juhl-Johansen Zölde-Fejér , 2011-2012. # Ole Holm Frandsen , 2012. @@ -14,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-12 23:17+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-24 00:10+0100\n" +"PO-Revision-Date: 2012-12-23 21:57+0000\n" +"Last-Translator: cronner \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" @@ -27,30 +28,30 @@ msgstr "" #: ajax/share.php:84 #, php-format msgid "User %s shared a file with you" -msgstr "" +msgstr "Bruger %s delte en fil med dig" #: ajax/share.php:86 #, php-format msgid "User %s shared a folder with you" -msgstr "" +msgstr "Bruger %s delte en mappe med dig" #: ajax/share.php:88 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" -msgstr "" +msgstr "Bruger %s delte filen \"%s\" med dig. Den kan hentes her: %s" #: ajax/share.php:90 #, php-format msgid "" "User %s shared the folder \"%s\" with you. It is available for download " "here: %s" -msgstr "" +msgstr "Bruger %s delte mappe \"%s\" med dig. Det kan hentes her: %s" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." -msgstr "" +msgstr "Kategori typen ikke er fastsat." #: ajax/vcategories/add.php:30 msgid "No category to add?" @@ -64,18 +65,18 @@ msgstr "Denne kategori eksisterer allerede: " #: ajax/vcategories/favorites.php:24 #: ajax/vcategories/removeFromFavorites.php:26 msgid "Object type not provided." -msgstr "" +msgstr "Object type ikke er fastsat." #: ajax/vcategories/addToFavorites.php:30 #: ajax/vcategories/removeFromFavorites.php:30 #, php-format msgid "%s ID not provided." -msgstr "" +msgstr "%s ID ikke oplyst." #: ajax/vcategories/addToFavorites.php:35 #, php-format msgid "Error adding %s to favorites." -msgstr "" +msgstr "Fejl ved tilføjelse af %s til favoritter." #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 msgid "No categories selected for deletion." @@ -84,7 +85,7 @@ msgstr "Ingen kategorier valgt" #: ajax/vcategories/removeFromFavorites.php:35 #, php-format msgid "Error removing %s from favorites." -msgstr "" +msgstr "Fejl ved fjernelse af %s fra favoritter." #: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61 msgid "Settings" @@ -104,11 +105,11 @@ msgstr "{minutes} minutter siden" #: js/js.js:707 msgid "1 hour ago" -msgstr "" +msgstr "1 time siden" #: js/js.js:708 msgid "{hours} hours ago" -msgstr "" +msgstr "{hours} timer siden" #: js/js.js:709 msgid "today" @@ -128,7 +129,7 @@ msgstr "sidste måned" #: js/js.js:713 msgid "{months} months ago" -msgstr "" +msgstr "{months} måneder siden" #: js/js.js:714 msgid "months ago" @@ -165,23 +166,23 @@ msgstr "OK" #: 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 "" +msgstr "Objekttypen er ikke angivet." #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 -#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541 -#: js/share.js:553 +#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554 +#: js/share.js:566 msgid "Error" msgstr "Fejl" #: js/oc-vcategories.js:179 msgid "The app name is not specified." -msgstr "" +msgstr "Den app navn er ikke angivet." #: js/oc-vcategories.js:194 msgid "The required file {file} is not installed!" -msgstr "" +msgstr "Den krævede fil {file} er ikke installeret!" -#: js/share.js:124 js/share.js:581 +#: js/share.js:124 js/share.js:594 msgid "Error while sharing" msgstr "Fejl under deling" @@ -209,22 +210,22 @@ msgstr "Del med" msgid "Share with link" msgstr "Del med link" -#: js/share.js:164 +#: js/share.js:166 msgid "Password protect" msgstr "Beskyt med adgangskode" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:35 #: templates/verify.php:13 msgid "Password" msgstr "Kodeord" #: js/share.js:172 msgid "Email link to person" -msgstr "" +msgstr "E-mail link til person" #: js/share.js:173 msgid "Send" -msgstr "" +msgstr "Send" #: js/share.js:177 msgid "Set expiration date" @@ -278,25 +279,25 @@ msgstr "slet" msgid "share" msgstr "del" -#: js/share.js:353 js/share.js:528 js/share.js:530 +#: js/share.js:356 js/share.js:541 msgid "Password protected" msgstr "Beskyttet med adgangskode" -#: js/share.js:541 +#: js/share.js:554 msgid "Error unsetting expiration date" msgstr "Fejl ved fjernelse af udløbsdato" -#: js/share.js:553 +#: js/share.js:566 msgid "Error setting expiration date" msgstr "Fejl under sætning af udløbsdato" -#: js/share.js:568 +#: js/share.js:581 msgid "Sending ..." -msgstr "" +msgstr "Sender ..." -#: js/share.js:579 +#: js/share.js:592 msgid "Email sent" -msgstr "" +msgstr "E-mail afsendt" #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -312,14 +313,14 @@ msgstr "Du vil modtage et link til at nulstille dit kodeord via email." #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "Reset-mail afsendt." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "Anmodningen mislykkedes!" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:28 msgid "Username" msgstr "Brugernavn" @@ -408,44 +409,44 @@ msgstr "Din data mappe og dine filer er muligvis tilgængelige fra internettet. msgid "Create an admin account" msgstr "Opret en administratorkonto" -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" msgstr "Avanceret" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" msgstr "Datamappe" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" msgstr "Konfigurer databasen" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" msgstr "vil blive brugt" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" msgstr "Databasebruger" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" msgstr "Databasekodeord" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" msgstr "Navn på database" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" msgstr "Database tabelplads" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" msgstr "Databasehost" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" msgstr "Afslut opsætning" @@ -533,29 +534,29 @@ msgstr "Webtjenester under din kontrol" msgid "Log out" msgstr "Log ud" -#: templates/login.php:8 +#: templates/login.php:10 msgid "Automatic logon rejected!" msgstr "Automatisk login afvist!" -#: templates/login.php:9 +#: templates/login.php:11 msgid "" "If you did not change your password recently, your account may be " "compromised!" msgstr "Hvis du ikke har ændret din adgangskode for nylig, har nogen muligvis tiltvunget sig adgang til din konto!" -#: templates/login.php:10 +#: templates/login.php:13 msgid "Please change your password to secure your account again." msgstr "Skift adgangskode for at sikre din konto igen." -#: templates/login.php:15 +#: templates/login.php:19 msgid "Lost your password?" msgstr "Mistet dit kodeord?" -#: templates/login.php:27 +#: templates/login.php:39 msgid "remember" msgstr "husk" -#: templates/login.php:28 +#: templates/login.php:41 msgid "Log in" msgstr "Log ind" diff --git a/l10n/da/files.po b/l10n/da/files.po index 2b9b44a9169..185ea7031e7 100644 --- a/l10n/da/files.po +++ b/l10n/da/files.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. # Morten Juhl-Johansen Zölde-Fejér , 2011-2012. # Ole Holm Frandsen , 2012. # , 2012. @@ -14,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-01 00:01+0100\n" -"PO-Revision-Date: 2012-11-30 23:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-24 00:10+0100\n" +"PO-Revision-Date: 2012-12-23 21:45+0000\n" +"Last-Translator: cronner \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" @@ -31,7 +32,7 @@ msgstr "Der er ingen fejl, filen blev uploadet med success" #: ajax/upload.php:21 msgid "" "The uploaded file exceeds the upload_max_filesize directive in php.ini: " -msgstr "" +msgstr "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini" #: ajax/upload.php:23 msgid "" @@ -59,11 +60,11 @@ msgstr "Fejl ved skrivning til disk." msgid "Files" msgstr "Filer" -#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84 +#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85 msgid "Unshare" msgstr "Fjern deling" -#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90 +#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91 msgid "Delete" msgstr "Slet" @@ -71,39 +72,39 @@ msgstr "Slet" msgid "Rename" msgstr "Omdøb" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "{new_name} already exists" msgstr "{new_name} eksisterer allerede" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "replace" msgstr "erstat" -#: js/filelist.js:201 +#: js/filelist.js:199 msgid "suggest name" msgstr "foreslå navn" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "cancel" msgstr "fortryd" -#: js/filelist.js:250 +#: js/filelist.js:248 msgid "replaced {new_name}" msgstr "erstattede {new_name}" -#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286 +#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284 msgid "undo" msgstr "fortryd" -#: js/filelist.js:252 +#: js/filelist.js:250 msgid "replaced {new_name} with {old_name}" msgstr "erstattede {new_name} med {old_name}" -#: js/filelist.js:284 +#: js/filelist.js:282 msgid "unshared {files}" msgstr "ikke delte {files}" -#: js/filelist.js:286 +#: js/filelist.js:284 msgid "deleted {files}" msgstr "slettede {files}" @@ -111,82 +112,82 @@ msgstr "slettede {files}" msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt." -#: js/files.js:183 +#: js/files.js:174 msgid "generating ZIP-file, it may take some time." msgstr "genererer ZIP-fil, det kan tage lidt tid." -#: js/files.js:218 +#: js/files.js:212 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Kunne ikke uploade din fil, da det enten er en mappe eller er tom" -#: js/files.js:218 +#: js/files.js:212 msgid "Upload Error" msgstr "Fejl ved upload" -#: js/files.js:235 +#: js/files.js:229 msgid "Close" msgstr "Luk" -#: js/files.js:254 js/files.js:368 js/files.js:398 +#: js/files.js:248 js/files.js:362 js/files.js:392 msgid "Pending" msgstr "Afventer" -#: js/files.js:274 +#: js/files.js:268 msgid "1 file uploading" msgstr "1 fil uploades" -#: js/files.js:277 js/files.js:331 js/files.js:346 +#: js/files.js:271 js/files.js:325 js/files.js:340 msgid "{count} files uploading" msgstr "{count} filer uploades" -#: js/files.js:349 js/files.js:382 +#: js/files.js:343 js/files.js:376 msgid "Upload cancelled." msgstr "Upload afbrudt." -#: js/files.js:451 +#: js/files.js:445 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret." -#: js/files.js:523 +#: js/files.js:515 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" -msgstr "" +msgstr "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud" -#: js/files.js:704 +#: js/files.js:699 msgid "{count} files scanned" msgstr "{count} filer skannet" -#: js/files.js:712 +#: js/files.js:707 msgid "error while scanning" msgstr "fejl under scanning" -#: js/files.js:785 templates/index.php:65 +#: js/files.js:780 templates/index.php:66 msgid "Name" msgstr "Navn" -#: js/files.js:786 templates/index.php:76 +#: js/files.js:781 templates/index.php:77 msgid "Size" msgstr "Størrelse" -#: js/files.js:787 templates/index.php:78 +#: js/files.js:782 templates/index.php:79 msgid "Modified" msgstr "Ændret" -#: js/files.js:814 +#: js/files.js:801 msgid "1 folder" msgstr "1 mappe" -#: js/files.js:816 +#: js/files.js:803 msgid "{count} folders" msgstr "{count} mapper" -#: js/files.js:824 +#: js/files.js:811 msgid "1 file" msgstr "1 fil" -#: js/files.js:826 +#: js/files.js:813 msgid "{count} files" msgstr "{count} filer" @@ -236,7 +237,7 @@ msgstr "Mappe" #: templates/index.php:14 msgid "From link" -msgstr "" +msgstr "Fra link" #: templates/index.php:35 msgid "Upload" @@ -246,28 +247,28 @@ msgstr "Upload" msgid "Cancel upload" msgstr "Fortryd upload" -#: templates/index.php:57 +#: templates/index.php:58 msgid "Nothing in here. Upload something!" msgstr "Her er tomt. Upload noget!" -#: templates/index.php:71 +#: templates/index.php:72 msgid "Download" msgstr "Download" -#: templates/index.php:103 +#: templates/index.php:104 msgid "Upload too large" msgstr "Upload for stor" -#: templates/index.php:105 +#: templates/index.php:106 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server." -#: templates/index.php:110 +#: templates/index.php:111 msgid "Files are being scanned, please wait." msgstr "Filerne bliver indlæst, vent venligst." -#: templates/index.php:113 +#: templates/index.php:114 msgid "Current scanning" msgstr "Indlæser" diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po index 804a2489d08..d21b07f05e6 100644 --- a/l10n/da/files_external.po +++ b/l10n/da/files_external.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. # Morten Juhl-Johansen Zölde-Fejér , 2012. # Ole Holm Frandsen , 2012. 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: 2012-12-24 00:10+0100\n" +"PO-Revision-Date: 2012-12-23 21:47+0000\n" +"Last-Translator: cronner \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" @@ -47,14 +48,14 @@ msgstr "Fejl ved konfiguration af Google Drive plads" msgid "" "Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr " Advarsel: \"smbclient\" ikke er installeret. Montering af CIFS / SMB delinger er ikke muligt. Spørg din systemadministrator om at installere det." #: lib/config.php:435 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 " Advarsel: FTP-understøttelse i PHP ikke er aktiveret eller installeret. Montering af FTP delinger er ikke muligt. Spørg din systemadministrator om at installere det." #: templates/settings.php:3 msgid "External Storage" @@ -101,7 +102,7 @@ msgid "Users" msgstr "Brugere" #: 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 "Slet" @@ -113,10 +114,10 @@ msgstr "Aktiver ekstern opbevaring for brugere" msgid "Allow users to mount their own external storage" msgstr "Tillad brugere at montere deres egne eksterne opbevaring" -#: templates/settings.php:139 +#: templates/settings.php:136 msgid "SSL root certificates" msgstr "SSL-rodcertifikater" -#: templates/settings.php:158 +#: templates/settings.php:153 msgid "Import Root Certificate" msgstr "Importer rodcertifikat" diff --git a/l10n/da/lib.po b/l10n/da/lib.po index 76cd064267c..187d797c533 100644 --- a/l10n/da/lib.po +++ b/l10n/da/lib.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. # Morten Juhl-Johansen Zölde-Fejér , 2012. # , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-16 00:02+0100\n" -"PO-Revision-Date: 2012-11-14 23:13+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-24 00:11+0100\n" +"PO-Revision-Date: 2012-12-23 21:58+0000\n" +"Last-Translator: cronner \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" @@ -19,43 +20,43 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:285 +#: app.php:287 msgid "Help" msgstr "Hjælp" -#: app.php:292 +#: app.php:294 msgid "Personal" msgstr "Personlig" -#: app.php:297 +#: app.php:299 msgid "Settings" msgstr "Indstillinger" -#: app.php:302 +#: app.php:304 msgid "Users" msgstr "Brugere" -#: app.php:309 +#: app.php:311 msgid "Apps" msgstr "Apps" -#: app.php:311 +#: app.php:313 msgid "Admin" msgstr "Admin" -#: files.php:332 +#: files.php:365 msgid "ZIP download is turned off." msgstr "ZIP-download er slået fra." -#: files.php:333 +#: files.php:366 msgid "Files need to be downloaded one by one." msgstr "Filer skal downloades en for en." -#: files.php:333 files.php:358 +#: files.php:366 files.php:391 msgid "Back to Files" msgstr "Tilbage til Filer" -#: files.php:357 +#: files.php:390 msgid "Selected files too large to generate zip file." msgstr "De markerede filer er for store til at generere en ZIP-fil." @@ -81,7 +82,7 @@ msgstr "SMS" #: search/provider/file.php:29 msgid "Images" -msgstr "" +msgstr "Billeder" #: template.php:103 msgid "seconds ago" @@ -98,12 +99,12 @@ msgstr "%d minutter siden" #: template.php:106 msgid "1 hour ago" -msgstr "" +msgstr "1 time siden" #: template.php:107 #, php-format msgid "%d hours ago" -msgstr "" +msgstr "%d timer siden" #: template.php:108 msgid "today" @@ -125,7 +126,7 @@ msgstr "Sidste måned" #: template.php:112 #, php-format msgid "%d months ago" -msgstr "" +msgstr "%d måneder siden" #: template.php:113 msgid "last year" @@ -151,4 +152,4 @@ msgstr "Check for opdateringer er deaktiveret" #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" -msgstr "" +msgstr "Kunne ikke finde kategorien \"%s\"" diff --git a/l10n/da/user_webdavauth.po b/l10n/da/user_webdavauth.po index 3ff9f07c589..73cb352861f 100644 --- a/l10n/da/user_webdavauth.po +++ b/l10n/da/user_webdavauth.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:12+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-24 00:10+0100\n" +"PO-Revision-Date: 2012-12-23 22:14+0000\n" +"Last-Translator: cronner \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" @@ -19,11 +20,11 @@ msgstr "" #: templates/settings.php:4 msgid "URL: http://" -msgstr "" +msgstr "URL: http://" #: templates/settings.php:6 msgid "" "ownCloud will send the user credentials to this URL is interpret http 401 " "and http 403 as credentials wrong and all other codes as credentials " "correct." -msgstr "" +msgstr "ownCloud vil sende brugeroplysningerne til denne webadresse er fortolker http 401 og http 403 som brugeroplysninger forkerte og alle andre koder som brugeroplysninger korrekte." diff --git a/l10n/sv/user_webdavauth.po b/l10n/sv/user_webdavauth.po index b6c5c862388..9d0afe72975 100644 --- a/l10n/sv/user_webdavauth.po +++ b/l10n/sv/user_webdavauth.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:12+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-24 00:10+0100\n" +"PO-Revision-Date: 2012-12-23 13:56+0000\n" +"Last-Translator: Magnus Höglund \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +20,7 @@ msgstr "" #: templates/settings.php:4 msgid "URL: http://" -msgstr "" +msgstr "URL: http://" #: templates/settings.php:6 msgid "" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 4b7fb0fec62..dd269ac2440 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-23 00:09+0100\n" +"POT-Creation-Date: 2012-12-24 00:10+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.pot b/l10n/templates/files.pot index 7a44cdd0641..d521a4ad6fc 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-23 00:09+0100\n" +"POT-Creation-Date: 2012-12-24 00:10+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_encryption.pot b/l10n/templates/files_encryption.pot index 8e65b3fa81d..791b21e4910 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-23 00:09+0100\n" +"POT-Creation-Date: 2012-12-24 00:10+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 d9aed4d9c67..8c1397baf0e 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-23 00:09+0100\n" +"POT-Creation-Date: 2012-12-24 00:10+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 f790c23a1b9..bc5ba1ad9ea 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-23 00:09+0100\n" +"POT-Creation-Date: 2012-12-24 00:10+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_versions.pot b/l10n/templates/files_versions.pot index d59a26bbdb8..0576b77aa21 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-23 00:09+0100\n" +"POT-Creation-Date: 2012-12-24 00:10+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 7c919b714a9..dd29190b8da 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-23 00:09+0100\n" +"POT-Creation-Date: 2012-12-24 00:11+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 f8796fdcda4..5528f1026e9 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-23 00:09+0100\n" +"POT-Creation-Date: 2012-12-24 00:11+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 69bcd199616..c783b1c38bb 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-23 00:09+0100\n" +"POT-Creation-Date: 2012-12-24 00:10+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 a09b859730d..835e8193715 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-23 00:09+0100\n" +"POT-Creation-Date: 2012-12-24 00:10+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/zh_CN/core.po b/l10n/zh_CN/core.po index 118d37c13f9..2742708ecc6 100644 --- a/l10n/zh_CN/core.po +++ b/l10n/zh_CN/core.po @@ -4,6 +4,7 @@ # # Translators: # , 2012. +# Dianjin Wang <1132321739qq@gmail.com>, 2012. # Phoenix Nemo <>, 2012. # , 2012. # , 2011, 2012. @@ -11,9 +12,9 @@ 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-12 23:17+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-24 00:10+0100\n" +"PO-Revision-Date: 2012-12-23 14:31+0000\n" +"Last-Translator: Dianjin Wang <1132321739qq@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,26 +25,26 @@ msgstr "" #: ajax/share.php:84 #, php-format msgid "User %s shared a file with you" -msgstr "" +msgstr "用户 %s 与您共享了一个文件" #: ajax/share.php:86 #, php-format msgid "User %s shared a folder with you" -msgstr "" +msgstr "用户 %s 与您共享了一个文件夹" #: ajax/share.php:88 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" -msgstr "" +msgstr "用户 %s 与您共享了文件\"%s\"。文件下载地址：%s" #: ajax/share.php:90 #, php-format msgid "" "User %s shared the folder \"%s\" with you. It is available for download " "here: %s" -msgstr "" +msgstr "用户 %s 与您共享了文件夹\"%s\"。文件夹下载地址：%s" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -165,8 +166,8 @@ 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:135 js/share.js:142 js/share.js:541 -#: js/share.js:553 +#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554 +#: js/share.js:566 msgid "Error" msgstr "错误" @@ -178,7 +179,7 @@ msgstr "未指定App名称。" msgid "The required file {file} is not installed!" msgstr "所需文件{file}未安装！" -#: js/share.js:124 js/share.js:581 +#: js/share.js:124 js/share.js:594 msgid "Error while sharing" msgstr "共享时出错" @@ -206,11 +207,11 @@ msgstr "共享" msgid "Share with link" msgstr "共享链接" -#: js/share.js:164 +#: js/share.js:166 msgid "Password protect" msgstr "密码保护" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:35 #: templates/verify.php:13 msgid "Password" msgstr "密码" @@ -221,7 +222,7 @@ msgstr "" #: js/share.js:173 msgid "Send" -msgstr "" +msgstr "发送" #: js/share.js:177 msgid "Set expiration date" @@ -275,25 +276,25 @@ msgstr "删除" msgid "share" msgstr "共享" -#: js/share.js:353 js/share.js:528 js/share.js:530 +#: js/share.js:356 js/share.js:541 msgid "Password protected" msgstr "密码已受保护" -#: js/share.js:541 +#: js/share.js:554 msgid "Error unsetting expiration date" msgstr "取消设置过期日期时出错" -#: js/share.js:553 +#: js/share.js:566 msgid "Error setting expiration date" msgstr "设置过期日期时出错" -#: js/share.js:568 +#: js/share.js:581 msgid "Sending ..." -msgstr "" +msgstr "正在发送..." -#: js/share.js:579 +#: js/share.js:592 msgid "Email sent" -msgstr "" +msgstr "邮件已发送" #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -315,8 +316,8 @@ msgstr "重置邮件已发送。" msgid "Request failed!" msgstr "请求失败！" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:28 msgid "Username" msgstr "用户名" @@ -405,44 +406,44 @@ msgstr "您的数据文件夹和文件可由互联网访问。OwnCloud提供的. msgid "Create an admin account" msgstr "创建管理员账号" -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" msgstr "高级" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" msgstr "数据目录" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" msgstr "配置数据库" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" msgstr "将被使用" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" msgstr "数据库用户" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" msgstr "数据库密码" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" msgstr "数据库名" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" msgstr "数据库表空间" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" msgstr "数据库主机" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" msgstr "安装完成" @@ -530,29 +531,29 @@ msgstr "由您掌控的网络服务" msgid "Log out" msgstr "注销" -#: templates/login.php:8 +#: templates/login.php:10 msgid "Automatic logon rejected!" msgstr "自动登录被拒绝！" -#: templates/login.php:9 +#: templates/login.php:11 msgid "" "If you did not change your password recently, your account may be " "compromised!" msgstr "如果您没有最近修改您的密码，您的帐户可能会受到影响！" -#: templates/login.php:10 +#: templates/login.php:13 msgid "Please change your password to secure your account again." msgstr "请修改您的密码，以保护您的账户安全。" -#: templates/login.php:15 +#: templates/login.php:19 msgid "Lost your password?" msgstr "忘记密码？" -#: templates/login.php:27 +#: templates/login.php:39 msgid "remember" msgstr "记住" -#: templates/login.php:28 +#: templates/login.php:41 msgid "Log in" msgstr "登录" diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po index fda4fc50739..674ecf16c69 100644 --- a/l10n/zh_CN/files_external.po +++ b/l10n/zh_CN/files_external.po @@ -4,13 +4,14 @@ # # Translators: # , 2012. +# Dianjin Wang <1132321739qq@gmail.com>, 2012. 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: 2012-12-24 00:10+0100\n" +"PO-Revision-Date: 2012-12-23 14:40+0000\n" +"Last-Translator: Dianjin Wang <1132321739qq@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -46,14 +47,14 @@ msgstr "配置Google Drive存储时出错" msgid "" "Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "警告：“smbclient” 尚未安装。CIFS/SMB 分享挂载无法实现。请咨询系统管理员进行安装。" #: lib/config.php:435 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 "警告：PHP中尚未启用或安装FTP。FTP 分享挂载无法实现。请咨询系统管理员进行安装。" #: templates/settings.php:3 msgid "External Storage" @@ -100,7 +101,7 @@ msgid "Users" msgstr "用户" #: 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 "删除" @@ -112,10 +113,10 @@ msgstr "启用用户外部存储" msgid "Allow users to mount their own external storage" msgstr "允许用户挂载自有外部存储" -#: templates/settings.php:139 +#: templates/settings.php:136 msgid "SSL root certificates" msgstr "SSL根证书" -#: templates/settings.php:158 +#: templates/settings.php:153 msgid "Import Root Certificate" msgstr "导入根证书" diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po index 8a68e4eac0a..2e39772a758 100644 --- a/l10n/zh_CN/settings.po +++ b/l10n/zh_CN/settings.po @@ -4,6 +4,7 @@ # # Translators: # , 2012. +# Dianjin Wang <1132321739qq@gmail.com>, 2012. # Phoenix Nemo <>, 2012. # , 2012. # , 2012. @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-24 00:11+0100\n" +"PO-Revision-Date: 2012-12-23 13:54+0000\n" +"Last-Translator: Dianjin Wang <1132321739qq@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -122,27 +123,27 @@ msgstr "-核准： #: templates/help.php:3 msgid "User Documentation" -msgstr "" +msgstr "用户文档" #: templates/help.php:4 msgid "Administrator Documentation" -msgstr "" +msgstr "管理员文档" #: templates/help.php:6 msgid "Online Documentation" -msgstr "" +msgstr "在线文档" #: templates/help.php:7 msgid "Forum" -msgstr "" +msgstr "论坛" #: templates/help.php:9 msgid "Bugtracker" -msgstr "" +msgstr "问题跟踪器" #: templates/help.php:11 msgid "Commercial Support" -msgstr "" +msgstr "商业支持" #: templates/personal.php:8 #, php-format @@ -155,15 +156,15 @@ msgstr "客户" #: templates/personal.php:13 msgid "Download Desktop Clients" -msgstr "" +msgstr "下载桌面客户端" #: templates/personal.php:14 msgid "Download Android Client" -msgstr "" +msgstr "下载 Android 客户端" #: templates/personal.php:15 msgid "Download iOS Client" -msgstr "" +msgstr "下载 iOS 客户端" #: templates/personal.php:21 templates/users.php:23 templates/users.php:77 msgid "Password" @@ -215,15 +216,15 @@ msgstr "帮助翻译" #: templates/personal.php:52 msgid "WebDAV" -msgstr "" +msgstr "WebDAV" #: templates/personal.php:54 msgid "Use this address to connect to your ownCloud in your file manager" -msgstr "" +msgstr "用该地址来连接文件管理器中的 ownCloud" #: templates/personal.php:63 msgid "Version" -msgstr "" +msgstr "版本" #: templates/personal.php:65 msgid "" diff --git a/l10n/zh_CN/user_webdavauth.po b/l10n/zh_CN/user_webdavauth.po index e8ca11af596..fc3ccc1393b 100644 --- a/l10n/zh_CN/user_webdavauth.po +++ b/l10n/zh_CN/user_webdavauth.po @@ -4,13 +4,14 @@ # # Translators: # , 2012. +# Dianjin Wang <1132321739qq@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:12+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-24 00:10+0100\n" +"PO-Revision-Date: 2012-12-23 13:55+0000\n" +"Last-Translator: Dianjin Wang <1132321739qq@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +21,7 @@ msgstr "" #: templates/settings.php:4 msgid "URL: http://" -msgstr "" +msgstr "URL：http://" #: templates/settings.php:6 msgid "" diff --git a/lib/l10n/ar.php b/lib/l10n/ar.php index 3ae226f04fd..77e02dd77b1 100644 --- a/lib/l10n/ar.php +++ b/lib/l10n/ar.php @@ -5,5 +5,8 @@ "Users" => "المستخدمين", "Authentication error" => "لم يتم التأكد من الشخصية بنجاح", "Files" => "الملفات", -"Text" => "معلومات إضافية" +"Text" => "معلومات إضافية", +"seconds ago" => "منذ ثواني", +"1 minute ago" => "منذ دقيقة", +"today" => "اليوم" ); diff --git a/lib/l10n/da.php b/lib/l10n/da.php index 7458b329782..a0ab1f17014 100644 --- a/lib/l10n/da.php +++ b/lib/l10n/da.php @@ -14,16 +14,21 @@ "Token expired. Please reload page." => "Adgang er udløbet. Genindlæs siden.", "Files" => "Filer", "Text" => "SMS", +"Images" => "Billeder", "seconds ago" => "sekunder siden", "1 minute ago" => "1 minut siden", "%d minutes ago" => "%d minutter siden", +"1 hour ago" => "1 time siden", +"%d hours ago" => "%d timer siden", "today" => "I dag", "yesterday" => "I går", "%d days ago" => "%d dage siden", "last month" => "Sidste måned", +"%d months ago" => "%d måneder siden", "last year" => "Sidste år", "years ago" => "år siden", "%s is available. Get more information" => "%s er tilgængelig. Få mere information", "up to date" => "opdateret", -"updates check is disabled" => "Check for opdateringer er deaktiveret" +"updates check is disabled" => "Check for opdateringer er deaktiveret", +"Could not find category \"%s\"" => "Kunne ikke finde kategorien \"%s\"" ); diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php index 9edbe1a4212..730db722111 100644 --- a/settings/l10n/ar.php +++ b/settings/l10n/ar.php @@ -1,14 +1,41 @@ "فشل تحميل القائمة من الآب ستور", +"Group already exists" => "المجموعة موجودة مسبقاً", +"Unable to add group" => "فشل إضافة المجموعة", +"Could not enable app. " => "فشل عملية تفعيل التطبيق", +"Email saved" => "تم حفظ البريد الإلكتروني", +"Invalid email" => "البريد الإلكتروني غير صالح", "OpenID Changed" => "تم تغيير ال OpenID", "Invalid request" => "طلبك غير مفهوم", +"Unable to delete group" => "فشل إزالة المجموعة", "Authentication error" => "لم يتم التأكد من الشخصية بنجاح", +"Unable to delete user" => "فشل إزالة المستخدم", "Language changed" => "تم تغيير اللغة", +"Admins can't remove themself from the admin group" => "لا يستطيع المدير إزالة حسابه من مجموعة المديرين", +"Unable to add user to group %s" => "فشل إضافة المستخدم الى المجموعة %s", +"Unable to remove user from group %s" => "فشل إزالة المستخدم من المجموعة %s", +"Disable" => "إيقاف", "Enable" => "تفعيل", "Saving..." => "حفظ", "__language_name__" => "__language_name__", +"Add your App" => "أضف تطبيقاتك", +"More Apps" => "المزيد من التطبيقات", "Select an App" => "إختر تطبيقاً", +"See application page at apps.owncloud.com" => "راجع صفحة التطبيق على apps.owncloud.com", +"-licensed by " => "-ترخيص من قبل ", +"User Documentation" => "كتاب توثيق المستخدم", +"Administrator Documentation" => "كتاب توثيق المدير", +"Online Documentation" => "توثيق متوفر على الشبكة", +"Forum" => "منتدى", +"Bugtracker" => "تعقب علة", +"Commercial Support" => "دعم تجاري", +"You have used %s of the available %s" => "تم إستهلاك %s من المتوفر %s", "Clients" => "الزبائن", +"Download Desktop Clients" => "تحميل عملاء سطح المكتب", +"Download Android Client" => "تحميل عميل آندرويد", +"Download iOS Client" => "تحميل عميل آي أو أس", "Password" => "كلمات السر", +"Your password was changed" => "لقد تم تغيير كلمة السر", "Unable to change your password" => "لم يتم تعديل كلمة السر بنجاح", "Current password" => "كلمات السر الحالية", "New password" => "كلمات سر جديدة", @@ -19,10 +46,16 @@ "Fill in an email address to enable password recovery" => "أدخل عنوانك البريدي لتفعيل استرجاع كلمة المرور", "Language" => "اللغة", "Help translate" => "ساعد في الترجمه", +"WebDAV" => "WebDAV", +"Use this address to connect to your ownCloud in your file manager" => "إستخدم هذا العنوان للإتصال بـ ownCloud في مدير الملفات", +"Version" => "إصدار", +"Developed by the ownCloud community, the source code is licensed under the AGPL." => "طوّر من قبل ownCloud مجتمع, الـ النص المصدري مرخص بموجب رخصة أفيرو العمومية.", "Name" => "الاسم", "Groups" => "مجموعات", "Create" => "انشئ", +"Default Quota" => "الحصة النسبية الإفتراضية", "Other" => "شيء آخر", +"Group Admin" => "مدير المجموعة", "Quota" => "حصه", "Delete" => "حذف" ); diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php index adc07e20675..99fb0b2279c 100644 --- a/settings/l10n/zh_CN.php +++ b/settings/l10n/zh_CN.php @@ -23,8 +23,17 @@ "Select an App" => "选择一个应用", "See application page at apps.owncloud.com" => "查看在 app.owncloud.com 的应用程序页面", "-licensed by " => "-核准： ", +"User Documentation" => "用户文档", +"Administrator Documentation" => "管理员文档", +"Online Documentation" => "在线文档", +"Forum" => "论坛", +"Bugtracker" => "问题跟踪器", +"Commercial Support" => "商业支持", "You have used %s of the available %s" => "你已使用 %s，有效空间 %s", "Clients" => "客户", +"Download Desktop Clients" => "下载桌面客户端", +"Download Android Client" => "下载 Android 客户端", +"Download iOS Client" => "下载 iOS 客户端", "Password" => "密码", "Your password was changed" => "密码已修改", "Unable to change your password" => "无法修改密码", @@ -37,6 +46,9 @@ "Fill in an email address to enable password recovery" => "填写电子邮件地址以启用密码恢复功能", "Language" => "语言", "Help translate" => "帮助翻译", +"WebDAV" => "WebDAV", +"Use this address to connect to your ownCloud in your file manager" => "用该地址来连接文件管理器中的 ownCloud", +"Version" => "版本", "Developed by the ownCloud community, the source code is licensed under the AGPL." => "由ownCloud社区开发， 源代码在AGPL许可证下发布。", "Name" => "名称", "Groups" => "组", -- cgit v1.2.3 From 27f9ea2abbe4ae34696ce6a2bb91d09455e39a9a Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Thu, 27 Dec 2012 00:05:17 +0100 Subject: [tx-robot] updated from transifex --- apps/files_encryption/l10n/he.php | 6 ++++ apps/user_ldap/l10n/el.php | 8 +++++ apps/user_ldap/l10n/ro.php | 2 ++ apps/user_webdavauth/l10n/ro.php | 4 +++ apps/user_webdavauth/l10n/ru.php | 2 +- core/l10n/ro.php | 1 + l10n/el/user_ldap.po | 23 ++++++------- l10n/he/files_encryption.po | 27 ++++++++-------- l10n/he/settings.po | 27 ++++++++-------- l10n/ro/core.po | 64 ++++++++++++++++++------------------- l10n/ro/lib.po | 37 ++++++++++----------- l10n/ro/user_ldap.po | 11 ++++--- l10n/ro/user_webdavauth.po | 11 ++++--- l10n/ru/settings.po | 21 ++++++------ l10n/ru/user_webdavauth.po | 9 +++--- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- lib/l10n/ro.php | 7 +++- settings/l10n/he.php | 10 ++++++ settings/l10n/ru.php | 7 ++++ 28 files changed, 174 insertions(+), 123 deletions(-) create mode 100644 apps/files_encryption/l10n/he.php create mode 100644 apps/user_webdavauth/l10n/ro.php (limited to 'lib') diff --git a/apps/files_encryption/l10n/he.php b/apps/files_encryption/l10n/he.php new file mode 100644 index 00000000000..0332d59520a --- /dev/null +++ b/apps/files_encryption/l10n/he.php @@ -0,0 +1,6 @@ + "הצפנה", +"Enable Encryption" => "הפעל הצפנה", +"None" => "כלום", +"Exclude the following file types from encryption" => "הוצא את סוגי הקבצים הבאים מהצפנה" +); diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php index e973eaac0a9..b16665b0aeb 100644 --- a/apps/user_ldap/l10n/el.php +++ b/apps/user_ldap/l10n/el.php @@ -1,18 +1,26 @@ "Base DN", +"You can specify Base DN for users and groups in the Advanced tab" => "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις", "User DN" => "User DN", "Password" => "Συνθηματικό", +"For anonymous access, leave DN and Password empty." => "Για ανώνυμη πρόσβαση, αφήστε κενά τα πεδία DN και Pasword.", "User Login Filter" => "User Login Filter", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Καθορίζει το φίλτρο που θα ισχύει κατά την προσπάθεια σύνδεσης χρήστη. %%uid αντικαθιστά το όνομα χρήστη κατά τη σύνδεση. ", "User List Filter" => "User List Filter", +"Defines the filter to apply, when retrieving users." => "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση επαφών.", "Group Filter" => "Group Filter", +"Defines the filter to apply, when retrieving groups." => "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση ομάδων.", "Port" => "Θύρα", "Base User Tree" => "Base User Tree", "Base Group Tree" => "Base Group Tree", "Group-Member association" => "Group-Member association", "Use TLS" => "Χρήση TLS", +"Do not use it for SSL connections, it will fail." => "Μην χρησιμοποιείτε για συνδέσεις SSL, θα αποτύχει.", +"Turn off SSL certificate validation." => "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL.", "Not recommended, use for testing only." => "Δεν προτείνεται, χρήση μόνο για δοκιμές.", "User Display Name Field" => "Πεδίο Ονόματος Χρήστη", "Group Display Name Field" => "Group Display Name Field", "in bytes" => "σε bytes", +"in seconds. A change empties the cache." => "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache.", "Help" => "Βοήθεια" ); diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php index beeed857455..b4d7d4902fe 100644 --- a/apps/user_ldap/l10n/ro.php +++ b/apps/user_ldap/l10n/ro.php @@ -1,4 +1,6 @@ Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Atentie: Apps user_ldap si user_webdavauth sunt incompatibile. Este posibil sa experimentati un comportament neasteptat. Vă rugăm să întrebați administratorul de sistem pentru a dezactiva una dintre ele.", +"Warning: The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "Atentie: "Gazdă", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://", "Base DN" => "DN de bază", diff --git a/apps/user_webdavauth/l10n/ro.php b/apps/user_webdavauth/l10n/ro.php new file mode 100644 index 00000000000..17157da044d --- /dev/null +++ b/apps/user_webdavauth/l10n/ro.php @@ -0,0 +1,4 @@ + "URL: http://", +"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "owncloud va trimite acreditatile de utilizator pentru a interpreta aceasta pagina. Http 401 si Http 403 are acreditarile si orice alt cod gresite ca acreditarile corecte" +); diff --git a/apps/user_webdavauth/l10n/ru.php b/apps/user_webdavauth/l10n/ru.php index 9bd32954b05..245a5101341 100644 --- a/apps/user_webdavauth/l10n/ru.php +++ b/apps/user_webdavauth/l10n/ru.php @@ -1,3 +1,3 @@ "WebDAV URL: http://" +"URL: http://" => "URL: http://" ); diff --git a/core/l10n/ro.php b/core/l10n/ro.php index 560ef5b9fc8..053c59330bd 100644 --- a/core/l10n/ro.php +++ b/core/l10n/ro.php @@ -5,6 +5,7 @@ "Settings" => "Configurări", "seconds ago" => "secunde în urmă", "1 minute ago" => "1 minut în urmă", +"1 hour ago" => "Acum o ora", "today" => "astăzi", "yesterday" => "ieri", "last month" => "ultima lună", diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po index cea052cafa1..3cbbac049eb 100644 --- a/l10n/el/user_ldap.po +++ b/l10n/el/user_ldap.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. # Dimitris M. , 2012. # Efstathios Iosifidis , 2012. # Marios Bekatoros <>, 2012. @@ -10,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-27 00:04+0100\n" +"PO-Revision-Date: 2012-12-26 17:22+0000\n" +"Last-Translator: AnAstAsiA \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" @@ -48,7 +49,7 @@ msgstr "Base DN" #: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" -msgstr "" +msgstr "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις" #: templates/settings.php:17 msgid "User DN" @@ -67,7 +68,7 @@ msgstr "Συνθηματικό" #: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." -msgstr "" +msgstr "Για ανώνυμη πρόσβαση, αφήστε κενά τα πεδία DN και Pasword." #: templates/settings.php:19 msgid "User Login Filter" @@ -78,7 +79,7 @@ msgstr "User Login Filter" msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." -msgstr "" +msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την προσπάθεια σύνδεσης χρήστη. %%uid αντικαθιστά το όνομα χρήστη κατά τη σύνδεση. " #: templates/settings.php:19 #, php-format @@ -91,7 +92,7 @@ msgstr "User List Filter" #: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." -msgstr "" +msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση επαφών." #: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." @@ -103,7 +104,7 @@ msgstr "Group Filter" #: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." -msgstr "" +msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση ομάδων." #: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." @@ -131,7 +132,7 @@ msgstr "Χρήση TLS" #: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." -msgstr "" +msgstr "Μην χρησιμοποιείτε για συνδέσεις SSL, θα αποτύχει." #: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" @@ -139,7 +140,7 @@ msgstr "" #: templates/settings.php:30 msgid "Turn off SSL certificate validation." -msgstr "" +msgstr "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL." #: templates/settings.php:30 msgid "" @@ -173,7 +174,7 @@ msgstr "σε bytes" #: templates/settings.php:36 msgid "in seconds. A change empties the cache." -msgstr "" +msgstr "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache." #: templates/settings.php:37 msgid "" diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po index ab535b9271f..860989631c4 100644 --- a/l10n/he/files_encryption.po +++ b/l10n/he/files_encryption.po @@ -3,32 +3,33 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Gilad Naaman , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-13 23:12+0200\n" -"PO-Revision-Date: 2012-08-12 22:33+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2012-12-27 00:04+0100\n" +"PO-Revision-Date: 2012-12-26 17:21+0000\n" +"Last-Translator: Gilad Naaman \n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: he\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:3 msgid "Encryption" -msgstr "" +msgstr "הצפנה" -#: templates/settings.php:4 -msgid "Exclude the following file types from encryption" -msgstr "" +#: templates/settings.php:6 +msgid "Enable Encryption" +msgstr "הפעל הצפנה" -#: templates/settings.php:5 +#: templates/settings.php:7 msgid "None" -msgstr "" +msgstr "כלום" -#: templates/settings.php:10 -msgid "Enable Encryption" -msgstr "" +#: templates/settings.php:12 +msgid "Exclude the following file types from encryption" +msgstr "הוצא את סוגי הקבצים הבאים מהצפנה" diff --git a/l10n/he/settings.po b/l10n/he/settings.po index 8cec0934f2a..1fe9d7e737f 100644 --- a/l10n/he/settings.po +++ b/l10n/he/settings.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Gilad Naaman , 2012. # , 2012. # , 2011. # Yaron Shahrabani , 2012. @@ -10,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-27 00:04+0100\n" +"PO-Revision-Date: 2012-12-26 14:12+0000\n" +"Last-Translator: Gilad Naaman \n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -120,19 +121,19 @@ msgstr "ברישיון לטובת \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -101,7 +101,7 @@ msgstr "" #: js/js.js:707 msgid "1 hour ago" -msgstr "" +msgstr "Acum o ora" #: js/js.js:708 msgid "{hours} hours ago" @@ -165,8 +165,8 @@ 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:135 js/share.js:142 js/share.js:541 -#: js/share.js:553 +#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554 +#: js/share.js:566 msgid "Error" msgstr "Eroare" @@ -178,7 +178,7 @@ msgstr "" msgid "The required file {file} is not installed!" msgstr "" -#: js/share.js:124 js/share.js:581 +#: js/share.js:124 js/share.js:594 msgid "Error while sharing" msgstr "Eroare la partajare" @@ -206,11 +206,11 @@ msgstr "Partajat cu" msgid "Share with link" msgstr "Partajare cu legătură" -#: js/share.js:164 +#: js/share.js:166 msgid "Password protect" msgstr "Protejare cu parolă" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:35 #: templates/verify.php:13 msgid "Password" msgstr "Parola" @@ -275,23 +275,23 @@ msgstr "ștergere" msgid "share" msgstr "partajare" -#: js/share.js:353 js/share.js:528 js/share.js:530 +#: js/share.js:356 js/share.js:541 msgid "Password protected" msgstr "Protejare cu parolă" -#: js/share.js:541 +#: js/share.js:554 msgid "Error unsetting expiration date" msgstr "Eroare la anularea datei de expirare" -#: js/share.js:553 +#: js/share.js:566 msgid "Error setting expiration date" msgstr "Eroare la specificarea datei de expirare" -#: js/share.js:568 +#: js/share.js:581 msgid "Sending ..." msgstr "" -#: js/share.js:579 +#: js/share.js:592 msgid "Email sent" msgstr "" @@ -315,8 +315,8 @@ msgstr "" msgid "Request failed!" msgstr "" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:28 msgid "Username" msgstr "Utilizator" @@ -405,44 +405,44 @@ msgstr "Directorul tău de date și fișierele tale probabil sunt accesibile pri msgid "Create an admin account" msgstr "Crează un cont de administrator" -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" msgstr "Avansat" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" msgstr "Director date" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" msgstr "Configurează baza de date" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" msgstr "vor fi folosite" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" msgstr "Utilizatorul bazei de date" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" msgstr "Parola bazei de date" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" msgstr "Numele bazei de date" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" msgstr "Tabela de spațiu a bazei de date" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" msgstr "Bază date" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" msgstr "Finalizează instalarea" @@ -530,29 +530,29 @@ msgstr "servicii web controlate de tine" msgid "Log out" msgstr "Ieșire" -#: templates/login.php:8 +#: templates/login.php:10 msgid "Automatic logon rejected!" msgstr "" -#: templates/login.php:9 +#: templates/login.php:11 msgid "" "If you did not change your password recently, your account may be " "compromised!" msgstr "" -#: templates/login.php:10 +#: templates/login.php:13 msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:15 +#: templates/login.php:19 msgid "Lost your password?" msgstr "Ai uitat parola?" -#: templates/login.php:27 +#: templates/login.php:39 msgid "remember" msgstr "amintește" -#: templates/login.php:28 +#: templates/login.php:41 msgid "Log in" msgstr "Autentificare" diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po index 827d2b17ea9..3cfb1c4c4a0 100644 --- a/l10n/ro/lib.po +++ b/l10n/ro/lib.po @@ -4,13 +4,14 @@ # # Translators: # , 2012. +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-16 00:02+0100\n" -"PO-Revision-Date: 2012-11-14 23:13+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-27 00:04+0100\n" +"PO-Revision-Date: 2012-12-26 05:14+0000\n" +"Last-Translator: laurentiucristescu \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,43 +19,43 @@ msgstr "" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: app.php:285 +#: app.php:287 msgid "Help" msgstr "Ajutor" -#: app.php:292 +#: app.php:294 msgid "Personal" msgstr "Personal" -#: app.php:297 +#: app.php:299 msgid "Settings" msgstr "Setări" -#: app.php:302 +#: app.php:304 msgid "Users" msgstr "Utilizatori" -#: app.php:309 +#: app.php:311 msgid "Apps" msgstr "Aplicații" -#: app.php:311 +#: app.php:313 msgid "Admin" msgstr "Admin" -#: files.php:332 +#: files.php:365 msgid "ZIP download is turned off." msgstr "Descărcarea ZIP este dezactivată." -#: files.php:333 +#: files.php:366 msgid "Files need to be downloaded one by one." msgstr "Fișierele trebuie descărcate unul câte unul." -#: files.php:333 files.php:358 +#: files.php:366 files.php:391 msgid "Back to Files" msgstr "Înapoi la fișiere" -#: files.php:357 +#: files.php:390 msgid "Selected files too large to generate zip file." msgstr "Fișierele selectate sunt prea mari pentru a genera un fișier zip." @@ -80,7 +81,7 @@ msgstr "Text" #: search/provider/file.php:29 msgid "Images" -msgstr "" +msgstr "Imagini" #: template.php:103 msgid "seconds ago" @@ -97,12 +98,12 @@ msgstr "%d minute în urmă" #: template.php:106 msgid "1 hour ago" -msgstr "" +msgstr "Acum o ora" #: template.php:107 #, php-format msgid "%d hours ago" -msgstr "" +msgstr "%d ore in urma" #: template.php:108 msgid "today" @@ -124,7 +125,7 @@ msgstr "ultima lună" #: template.php:112 #, php-format msgid "%d months ago" -msgstr "" +msgstr "%d luni in urma" #: template.php:113 msgid "last year" @@ -150,4 +151,4 @@ msgstr "verificarea după actualizări este dezactivată" #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" -msgstr "" +msgstr "Cloud nu a gasit categoria \"%s\"" diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po index a7e5abcc360..171e91b27d4 100644 --- a/l10n/ro/user_ldap.po +++ b/l10n/ro/user_ldap.po @@ -5,13 +5,14 @@ # Translators: # Dumitru Ursu <>, 2012. # , 2012. +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-27 00:04+0100\n" +"PO-Revision-Date: 2012-12-26 05:09+0000\n" +"Last-Translator: laurentiucristescu \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,13 +25,13 @@ 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 "Atentie: Apps user_ldap si user_webdavauth sunt incompatibile. Este posibil sa experimentati un comportament neasteptat. Vă rugăm să întrebați administratorul de sistem pentru a dezactiva una dintre ele." #: templates/settings.php:11 msgid "" "Warning: The PHP LDAP module needs is not installed, the backend will" " not work. Please ask your system administrator to install it." -msgstr "" +msgstr "Atentie:, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:12+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-27 00:04+0100\n" +"PO-Revision-Date: 2012-12-26 05:17+0000\n" +"Last-Translator: laurentiucristescu \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,11 +20,11 @@ msgstr "" #: templates/settings.php:4 msgid "URL: http://" -msgstr "" +msgstr "URL: http://" #: templates/settings.php:6 msgid "" "ownCloud will send the user credentials to this URL is interpret http 401 " "and http 403 as credentials wrong and all other codes as credentials " "correct." -msgstr "" +msgstr "owncloud va trimite acreditatile de utilizator pentru a interpreta aceasta pagina. Http 401 si Http 403 are acreditarile si orice alt cod gresite ca acreditarile corecte" diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po index d47fe1cca61..cfaa71c6af5 100644 --- a/l10n/ru/settings.po +++ b/l10n/ru/settings.po @@ -10,6 +10,7 @@ # Nick Remeslennikov , 2012. # , 2012. # , 2012. +# , 2012. # , 2012. # , 2011. # Victor Bravo <>, 2012. @@ -18,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-27 00:04+0100\n" +"PO-Revision-Date: 2012-12-26 06:17+0000\n" +"Last-Translator: adol \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" @@ -140,7 +141,7 @@ msgstr "" #: templates/help.php:7 msgid "Forum" -msgstr "" +msgstr "Форум" #: templates/help.php:9 msgid "Bugtracker" @@ -161,15 +162,15 @@ msgstr "Клиенты" #: templates/personal.php:13 msgid "Download Desktop Clients" -msgstr "" +msgstr "Загрузка приложений для компьютера" #: templates/personal.php:14 msgid "Download Android Client" -msgstr "" +msgstr "Загрузка Android-приложения" #: templates/personal.php:15 msgid "Download iOS Client" -msgstr "" +msgstr "Загрузка iOS-приложения" #: templates/personal.php:21 templates/users.php:23 templates/users.php:77 msgid "Password" @@ -221,15 +222,15 @@ msgstr "Помочь с переводом" #: templates/personal.php:52 msgid "WebDAV" -msgstr "" +msgstr "WebDAV" #: templates/personal.php:54 msgid "Use this address to connect to your ownCloud in your file manager" -msgstr "" +msgstr "Используйте этот URL для подключения файлового менеджера к Вашему хранилищу" #: templates/personal.php:63 msgid "Version" -msgstr "" +msgstr "Версия" #: templates/personal.php:65 msgid "" diff --git a/l10n/ru/user_webdavauth.po b/l10n/ru/user_webdavauth.po index 29fdee82122..12e0350b328 100644 --- a/l10n/ru/user_webdavauth.po +++ b/l10n/ru/user_webdavauth.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. # , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:12+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-27 00:04+0100\n" +"PO-Revision-Date: 2012-12-26 06:19+0000\n" +"Last-Translator: adol \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" @@ -20,7 +21,7 @@ msgstr "" #: templates/settings.php:4 msgid "URL: http://" -msgstr "" +msgstr "URL: http://" #: templates/settings.php:6 msgid "" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index cb81e4a3bf2..bb50657d0c1 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-26 00:11+0100\n" +"POT-Creation-Date: 2012-12-27 00:04+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.pot b/l10n/templates/files.pot index 36134e77ca2..03098019637 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-26 00:10+0100\n" +"POT-Creation-Date: 2012-12-27 00:04+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_encryption.pot b/l10n/templates/files_encryption.pot index d97815aa3c6..6eef8177d08 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-26 00:10+0100\n" +"POT-Creation-Date: 2012-12-27 00:04+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 4a58cc81cb8..ede827aedaf 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-26 00:10+0100\n" +"POT-Creation-Date: 2012-12-27 00:04+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 4df6821bdb7..56f4c1b25fa 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-26 00:10+0100\n" +"POT-Creation-Date: 2012-12-27 00:04+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_versions.pot b/l10n/templates/files_versions.pot index ea84ed78215..c93f0198ea2 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-26 00:10+0100\n" +"POT-Creation-Date: 2012-12-27 00:04+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 b7b1a122718..542c822edcd 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-26 00:11+0100\n" +"POT-Creation-Date: 2012-12-27 00:04+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 1f54f62fe9a..e2ebf0bd789 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-26 00:11+0100\n" +"POT-Creation-Date: 2012-12-27 00:04+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 f602b7e50c7..1beb1526e1c 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-26 00:10+0100\n" +"POT-Creation-Date: 2012-12-27 00:04+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 6afb31853e5..2de8510b34f 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-26 00:10+0100\n" +"POT-Creation-Date: 2012-12-27 00:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/lib/l10n/ro.php b/lib/l10n/ro.php index 27912550e17..d3ce066c8c1 100644 --- a/lib/l10n/ro.php +++ b/lib/l10n/ro.php @@ -14,16 +14,21 @@ "Token expired. Please reload page." => "Token expirat. Te rugăm să reîncarci pagina.", "Files" => "Fișiere", "Text" => "Text", +"Images" => "Imagini", "seconds ago" => "secunde în urmă", "1 minute ago" => "1 minut în urmă", "%d minutes ago" => "%d minute în urmă", +"1 hour ago" => "Acum o ora", +"%d hours ago" => "%d ore in urma", "today" => "astăzi", "yesterday" => "ieri", "%d days ago" => "%d zile în urmă", "last month" => "ultima lună", +"%d months ago" => "%d luni in urma", "last year" => "ultimul an", "years ago" => "ani în urmă", "%s is available. Get more information" => "%s este disponibil. Vezi mai multe informații", "up to date" => "la zi", -"updates check is disabled" => "verificarea după actualizări este dezactivată" +"updates check is disabled" => "verificarea după actualizări este dezactivată", +"Could not find category \"%s\"" => "Cloud nu a gasit categoria \"%s\"" ); diff --git a/settings/l10n/he.php b/settings/l10n/he.php index 2524c076b79..ce9e61be291 100644 --- a/settings/l10n/he.php +++ b/settings/l10n/he.php @@ -23,8 +23,16 @@ "Select an App" => "בחירת יישום", "See application page at apps.owncloud.com" => "צפה בעמוד הישום ב apps.owncloud.com", "-licensed by " => "ברישיון לטובת ", +"User Documentation" => "תיעוד משתמש", +"Administrator Documentation" => "תיעוד מנהלים", +"Online Documentation" => "תיעוד מקוון", +"Forum" => "פורום", +"Commercial Support" => "תמיכה בתשלום", "You have used %s of the available %s" => "השתמשת ב־%s מתוך %s הזמינים לך", "Clients" => "לקוחות", +"Download Desktop Clients" => "הורד לתוכנה למחשב", +"Download Android Client" => "הורד תוכנה לאנדרואיד", +"Download iOS Client" => "הורד תוכנה לiOS", "Password" => "ססמה", "Your password was changed" => "הססמה שלך הוחלפה", "Unable to change your password" => "לא ניתן לשנות את הססמה שלך", @@ -37,6 +45,8 @@ "Fill in an email address to enable password recovery" => "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה", "Language" => "פה", "Help translate" => "עזרה בתרגום", +"Use this address to connect to your ownCloud in your file manager" => "השתמש בכתובת זאת על מנת להתחבר אל ownCloud דרך סייר קבצים.", +"Version" => "גרסא", "Developed by the ownCloud community, the source code is licensed under the AGPL." => "פותח על די קהילתownCloud, קוד המקור מוגן ברישיון AGPL.", "Name" => "שם", "Groups" => "קבוצות", diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php index ba26cb13353..bef330b92b7 100644 --- a/settings/l10n/ru.php +++ b/settings/l10n/ru.php @@ -23,8 +23,12 @@ "Select an App" => "Выберите приложение", "See application page at apps.owncloud.com" => "Смотрите дополнения на apps.owncloud.com", "-licensed by " => " лицензия. Автор ", +"Forum" => "Форум", "You have used %s of the available %s" => "Вы использовали %s из доступных %s", "Clients" => "Клиенты", +"Download Desktop Clients" => "Загрузка приложений для компьютера", +"Download Android Client" => "Загрузка Android-приложения", +"Download iOS Client" => "Загрузка iOS-приложения", "Password" => "Пароль", "Your password was changed" => "Ваш пароль изменён", "Unable to change your password" => "Невозможно сменить пароль", @@ -37,6 +41,9 @@ "Fill in an email address to enable password recovery" => "Введите адрес электронной почты, чтобы появилась возможность восстановления пароля", "Language" => "Язык", "Help translate" => "Помочь с переводом", +"WebDAV" => "WebDAV", +"Use this address to connect to your ownCloud in your file manager" => "Используйте этот URL для подключения файлового менеджера к Вашему хранилищу", +"Version" => "Версия", "Developed by the ownCloud community, the source code is licensed under the AGPL." => "Разрабатывается сообществом ownCloud, исходный код доступен под лицензией AGPL.", "Name" => "Имя", "Groups" => "Группы", -- cgit v1.2.3 From e9c51b319e3d0a8017b769ea0b27b5bd99fcc705 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Fri, 28 Dec 2012 00:20:34 +0100 Subject: [tx-robot] updated from transifex --- apps/files/l10n/el.php | 4 +- apps/files/l10n/ro.php | 15 ++++ apps/files/l10n/tr.php | 11 +++ apps/files_encryption/l10n/tr.php | 6 ++ apps/files_external/l10n/eu.php | 2 + apps/files_external/l10n/tr.php | 13 +++- apps/files_versions/l10n/tr.php | 8 +++ apps/user_ldap/l10n/el.php | 13 ++++ apps/user_ldap/l10n/eu.php | 2 + apps/user_ldap/l10n/tr.php | 12 ++++ apps/user_webdavauth/l10n/el.php | 3 +- apps/user_webdavauth/l10n/eo.php | 2 +- apps/user_webdavauth/l10n/eu.php | 3 +- apps/user_webdavauth/l10n/tr.php | 2 +- core/l10n/ro.php | 20 +++++- core/l10n/tr.php | 37 +++++++++- l10n/el/files.po | 83 +++++++++++----------- l10n/el/user_ldap.po | 33 ++++----- l10n/el/user_webdavauth.po | 9 +-- l10n/eo/user_webdavauth.po | 8 +-- l10n/eu/files_external.po | 16 ++--- l10n/eu/settings.po | 30 ++++---- l10n/eu/user_ldap.po | 10 +-- l10n/eu/user_webdavauth.po | 10 +-- l10n/ro/core.po | 43 ++++++------ l10n/ro/files.po | 109 ++++++++++++++--------------- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- l10n/tr/core.po | 134 ++++++++++++++++++------------------ l10n/tr/files.po | 100 +++++++++++++-------------- l10n/tr/files_encryption.po | 27 ++++---- l10n/tr/files_external.po | 35 +++++----- l10n/tr/files_versions.po | 23 ++++--- l10n/tr/lib.po | 77 +++++++++++---------- l10n/tr/settings.po | 28 ++++---- l10n/tr/user_ldap.po | 27 ++++---- l10n/tr/user_webdavauth.po | 9 +-- lib/l10n/tr.php | 27 +++++++- settings/l10n/eu.php | 12 ++++ settings/l10n/tr.php | 11 +++ 48 files changed, 614 insertions(+), 420 deletions(-) create mode 100644 apps/files_encryption/l10n/tr.php create mode 100644 apps/files_versions/l10n/tr.php create mode 100644 apps/user_ldap/l10n/tr.php (limited to 'lib') diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php index ddbea421241..fce7a07c948 100644 --- a/apps/files/l10n/el.php +++ b/apps/files/l10n/el.php @@ -28,7 +28,7 @@ "1 file uploading" => "1 αρχείο ανεβαίνει", "{count} files uploading" => "{count} αρχεία ανεβαίνουν", "Upload cancelled." => "Η αποστολή ακυρώθηκε.", -"File upload is in progress. Leaving the page now will cancel the upload." => "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Έξοδος από την σελίδα τώρα θα ακυρώσει την αποστολή.", +"File upload is in progress. Leaving the page now will cancel the upload." => "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.", "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Μη έγκυρο όνομα φακέλου. Η χρήση του \"Shared\" είναι δεσμευμένη από το Owncloud", "{count} files scanned" => "{count} αρχεία ανιχνεύτηκαν", "error while scanning" => "σφάλμα κατά την ανίχνευση", @@ -56,7 +56,7 @@ "Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Ανέβασε κάτι!", "Download" => "Λήψη", "Upload too large" => "Πολύ μεγάλο αρχείο προς αποστολή", -"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν το διακομιστή.", +"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.", "Files are being scanned, please wait." => "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε", "Current scanning" => "Τρέχουσα αναζήτηση " ); diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php index 34e8dc8a50e..7244a6677a3 100644 --- a/apps/files/l10n/ro.php +++ b/apps/files/l10n/ro.php @@ -1,5 +1,6 @@ "Nicio eroare, fișierul a fost încărcat cu succes", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fisierul incarcat depaseste upload_max_filesize permisi in php.ini: ", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Fișierul are o dimensiune mai mare decât variabile MAX_FILE_SIZE specificată în formularul HTML", "The uploaded file was only partially uploaded" => "Fișierul a fost încărcat doar parțial", "No file was uploaded" => "Niciun fișier încărcat", @@ -9,22 +10,35 @@ "Unshare" => "Anulează partajarea", "Delete" => "Șterge", "Rename" => "Redenumire", +"{new_name} already exists" => "{new_name} deja exista", "replace" => "înlocuire", "suggest name" => "sugerează nume", "cancel" => "anulare", +"replaced {new_name}" => "inlocuit {new_name}", "undo" => "Anulează ultima acțiune", +"replaced {new_name} with {old_name}" => "{new_name} inlocuit cu {old_name}", +"unshared {files}" => "nedistribuit {files}", +"deleted {files}" => "Sterse {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nume invalid, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise.", "generating ZIP-file, it may take some time." => "se generază fișierul ZIP, va dura ceva timp.", "Unable to upload your file as it is a directory or has 0 bytes" => "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes.", "Upload Error" => "Eroare la încărcare", "Close" => "Închide", "Pending" => "În așteptare", "1 file uploading" => "un fișier se încarcă", +"{count} files uploading" => "{count} fisiere incarcate", "Upload cancelled." => "Încărcare anulată.", "File upload is in progress. Leaving the page now will cancel the upload." => "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Nume de folder invalid. Numele este rezervat pentru OwnCloud", +"{count} files scanned" => "{count} fisiere scanate", "error while scanning" => "eroare la scanarea", "Name" => "Nume", "Size" => "Dimensiune", "Modified" => "Modificat", +"1 folder" => "1 folder", +"{count} folders" => "{count} foldare", +"1 file" => "1 fisier", +"{count} files" => "{count} fisiere", "File handling" => "Manipulare fișiere", "Maximum upload size" => "Dimensiune maximă admisă la încărcare", "max. possible: " => "max. posibil:", @@ -36,6 +50,7 @@ "New" => "Nou", "Text file" => "Fișier text", "Folder" => "Dosar", +"From link" => "de la adresa", "Upload" => "Încarcă", "Cancel upload" => "Anulează încărcarea", "Nothing in here. Upload something!" => "Nimic aici. Încarcă ceva!", diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php index 061ed1f3ae2..7cd3a82cd71 100644 --- a/apps/files/l10n/tr.php +++ b/apps/files/l10n/tr.php @@ -1,5 +1,6 @@ "Bir hata yok, dosya başarıyla yüklendi", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı.", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Yüklenen dosya HTML formundaki MAX_FILE_SIZE sınırını aşıyor", "The uploaded file was only partially uploaded" => "Yüklenen dosyanın sadece bir kısmı yüklendi", "No file was uploaded" => "Hiç dosya yüklenmedi", @@ -15,20 +16,29 @@ "cancel" => "iptal", "replaced {new_name}" => "değiştirilen {new_name}", "undo" => "geri al", +"replaced {new_name} with {old_name}" => "{new_name} ismi {old_name} ile değiştirildi", "unshared {files}" => "paylaşılmamış {files}", "deleted {files}" => "silinen {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir.", "generating ZIP-file, it may take some time." => "ZIP dosyası oluşturuluyor, biraz sürebilir.", "Unable to upload your file as it is a directory or has 0 bytes" => "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi", "Upload Error" => "Yükleme hatası", "Close" => "Kapat", "Pending" => "Bekliyor", "1 file uploading" => "1 dosya yüklendi", +"{count} files uploading" => "{count} dosya yükleniyor", "Upload cancelled." => "Yükleme iptal edildi.", "File upload is in progress. Leaving the page now will cancel the upload." => "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Geçersiz dizin ismi. \"Shared\" dizini OwnCloud tarafından kullanılmaktadır.", +"{count} files scanned" => "{count} dosya tarandı", "error while scanning" => "tararamada hata oluşdu", "Name" => "Ad", "Size" => "Boyut", "Modified" => "Değiştirilme", +"1 folder" => "1 dizin", +"{count} folders" => "{count} dizin", +"1 file" => "1 dosya", +"{count} files" => "{count} dosya", "File handling" => "Dosya taşıma", "Maximum upload size" => "Maksimum yükleme boyutu", "max. possible: " => "mümkün olan en fazla: ", @@ -40,6 +50,7 @@ "New" => "Yeni", "Text file" => "Metin dosyası", "Folder" => "Klasör", +"From link" => "Bağlantıdan", "Upload" => "Yükle", "Cancel upload" => "Yüklemeyi iptal et", "Nothing in here. Upload something!" => "Burada hiçbir şey yok. Birşeyler yükleyin!", diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php new file mode 100644 index 00000000000..474ee42b842 --- /dev/null +++ b/apps/files_encryption/l10n/tr.php @@ -0,0 +1,6 @@ + "Şifreleme", +"Enable Encryption" => "Şifrelemeyi Etkinleştir", +"None" => "Hiçbiri", +"Exclude the following file types from encryption" => "Aşağıdaki dosya tiplerini şifrelemeye dahil etme" +); diff --git a/apps/files_external/l10n/eu.php b/apps/files_external/l10n/eu.php index dccd377b119..597204c894d 100644 --- a/apps/files_external/l10n/eu.php +++ b/apps/files_external/l10n/eu.php @@ -5,6 +5,8 @@ "Fill out all required fields" => "Bete eskatutako eremu guztiak", "Please provide a valid Dropbox app key and secret." => "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua", "Error configuring Google Drive storage" => "Errore bat egon da Google Drive biltegiratzea konfiguratzean", +"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Abisua: \"smbclient\" ez dago instalatuta. CIFS/SMB partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea.", +"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." => "Abisua: PHPren FTP modulua ez dago instalatuta edo gaitua. FTP partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea.", "External Storage" => "Kanpoko Biltegiratzea", "Mount point" => "Montatze puntua", "Backend" => "Motorra", diff --git a/apps/files_external/l10n/tr.php b/apps/files_external/l10n/tr.php index c5e9f8f892f..e9a045aab57 100644 --- a/apps/files_external/l10n/tr.php +++ b/apps/files_external/l10n/tr.php @@ -1,5 +1,16 @@ "Harici Depolama", +"Mount point" => "Bağlama Noktası", +"Backend" => "Yönetici", +"Configuration" => "Yapılandırma", +"Options" => "Seçenekler", +"Applicable" => "Uygulanabilir", +"Add mount point" => "Bağlama noktası ekle", +"None set" => "Hiçbiri", +"All Users" => "Tüm Kullanıcılar", "Groups" => "Gruplar", "Users" => "Kullanıcılar", -"Delete" => "Sil" +"Delete" => "Sil", +"SSL root certificates" => "SSL kök sertifikaları", +"Import Root Certificate" => "Kök Sertifikalarını İçe Aktar" ); diff --git a/apps/files_versions/l10n/tr.php b/apps/files_versions/l10n/tr.php new file mode 100644 index 00000000000..73f207d5024 --- /dev/null +++ b/apps/files_versions/l10n/tr.php @@ -0,0 +1,8 @@ + "Tüm sürümleri sona erdir", +"History" => "Geçmiş", +"Versions" => "Sürümler", +"This will delete all existing backup versions of your files" => "Bu dosyalarınızın tüm yedek sürümlerini silecektir", +"Files Versioning" => "Dosya Sürümleri", +"Enable" => "Etkinleştir" +); diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php index b16665b0aeb..8c421cf162b 100644 --- a/apps/user_ldap/l10n/el.php +++ b/apps/user_ldap/l10n/el.php @@ -1,26 +1,39 @@ Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Προσοχή: Οι εφαρμογές user_ldap και user_webdavauth είναι ασύμβατες. Μπορεί να αντιμετωπίσετε απρόβλεπτη συμπεριφορά. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να απενεργοποιήσει μία από αυτές.", +"Warning: The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "Προσοχή: Το PHP LDAP module που απαιτείται δεν είναι εγκατεστημένο και ο μηχανισμός δεν θα λειτουργήσει. Παρακαλώ ζητήστε από τον διαχειριστή του συστήματος να το εγκαταστήσει.", +"Host" => "Διακομιστής", +"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://", "Base DN" => "Base DN", "You can specify Base DN for users and groups in the Advanced tab" => "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις", "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 του χρήστη πελάτη με το οποίο θα πρέπει να γίνει η σύνδεση, π.χ. uid=agent,dc=example,dc=com. Για χρήση χωρίς πιστοποίηση, αφήστε το DN και τον Κωδικό κενά.", "Password" => "Συνθηματικό", "For anonymous access, leave DN and Password empty." => "Για ανώνυμη πρόσβαση, αφήστε κενά τα πεδία DN και Pasword.", "User Login Filter" => "User Login Filter", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Καθορίζει το φίλτρο που θα ισχύει κατά την προσπάθεια σύνδεσης χρήστη. %%uid αντικαθιστά το όνομα χρήστη κατά τη σύνδεση. ", +"use %%uid placeholder, e.g. \"uid=%%uid\"" => "χρησιμοποιήστε τη μεταβλητή %%uid, π.χ. \"uid=%%uid\"", "User List Filter" => "User List Filter", "Defines the filter to apply, when retrieving users." => "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση επαφών.", +"without any placeholder, e.g. \"objectClass=person\"." => "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=άτομο\".", "Group Filter" => "Group Filter", "Defines the filter to apply, when retrieving groups." => "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση ομάδων.", +"without any placeholder, e.g. \"objectClass=posixGroup\"." => "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=ΟμάδαPosix\".", "Port" => "Θύρα", "Base User Tree" => "Base User Tree", "Base Group Tree" => "Base Group Tree", "Group-Member association" => "Group-Member association", "Use TLS" => "Χρήση TLS", "Do not use it for SSL connections, it will fail." => "Μην χρησιμοποιείτε για συνδέσεις SSL, θα αποτύχει.", +"Case insensitve LDAP server (Windows)" => "LDAP server (Windows) με διάκριση πεζών-ΚΕΦΑΛΑΙΩΝ", "Turn off SSL certificate validation." => "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL.", +"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Εάν η σύνδεση δουλεύει μόνο με αυτή την επιλογή, εισάγετε το LDAP SSL πιστοποιητικό του διακομιστή στον ownCloud server σας.", "Not recommended, use for testing only." => "Δεν προτείνεται, χρήση μόνο για δοκιμές.", "User Display Name Field" => "Πεδίο Ονόματος Χρήστη", +"The LDAP attribute to use to generate the user`s ownCloud name." => "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος χρήστη του ownCloud.", "Group Display Name Field" => "Group Display Name Field", +"The LDAP attribute to use to generate the groups`s ownCloud name." => "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος ομάδας του ownCloud.", "in bytes" => "σε bytes", "in seconds. A change empties the cache." => "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache.", +"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Αφήστε το κενό για το όνομα χρήστη (προεπιλογή). Διαφορετικά, συμπληρώστε μία ιδιότητα LDAP/AD.", "Help" => "Βοήθεια" ); diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php index 35dacef3f2f..06ca9cb294e 100644 --- a/apps/user_ldap/l10n/eu.php +++ b/apps/user_ldap/l10n/eu.php @@ -1,4 +1,6 @@ Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Abisua: user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko.", +"Warning: The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "Abisua: PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan.", "Host" => "Hostalaria", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://", "Base DN" => "Oinarrizko DN", diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php new file mode 100644 index 00000000000..e9098d7017d --- /dev/null +++ b/apps/user_ldap/l10n/tr.php @@ -0,0 +1,12 @@ + "Konak", +"Base DN" => "Base DN", +"User DN" => "User DN", +"Password" => "Parola", +"User Login Filter" => "Kullanıcı Oturum Açma Süzgeci", +"User List Filter" => "Kullanıcı Liste Süzgeci", +"Group Filter" => "Grup Süzgeci", +"Port" => "Port", +"Use TLS" => "TLS kullan", +"Help" => "Yardım" +); diff --git a/apps/user_webdavauth/l10n/el.php b/apps/user_webdavauth/l10n/el.php index 245a5101341..bf4c11af64c 100644 --- a/apps/user_webdavauth/l10n/el.php +++ b/apps/user_webdavauth/l10n/el.php @@ -1,3 +1,4 @@ "URL: http://" +"URL: http://" => "URL: http://", +"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "Το ownCloud θα στείλει τα συνθηματικά χρήστη σε αυτό το URL, μεταφράζοντας τα http 401 και http 403 ως λανθασμένα συνθηματικά και όλους τους άλλους κωδικούς ως σωστά συνθηματικά." ); diff --git a/apps/user_webdavauth/l10n/eo.php b/apps/user_webdavauth/l10n/eo.php index b4a2652d33e..245a5101341 100644 --- a/apps/user_webdavauth/l10n/eo.php +++ b/apps/user_webdavauth/l10n/eo.php @@ -1,3 +1,3 @@ "WebDAV-a URL: http://" +"URL: http://" => "URL: http://" ); diff --git a/apps/user_webdavauth/l10n/eu.php b/apps/user_webdavauth/l10n/eu.php index 9bd32954b05..bbda9f10ba0 100644 --- a/apps/user_webdavauth/l10n/eu.php +++ b/apps/user_webdavauth/l10n/eu.php @@ -1,3 +1,4 @@ "WebDAV URL: http://" +"URL: http://" => "URL: http://", +"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud erabiltzailearen kredentzialak helbide honetara bidaliko ditu. http 401 eta http 403 kredentzial ez zuzenak bezala hartuko dira eta beste kode guztiak kredentzial zuzentzat hartuko dira." ); diff --git a/apps/user_webdavauth/l10n/tr.php b/apps/user_webdavauth/l10n/tr.php index 9bd32954b05..245a5101341 100644 --- a/apps/user_webdavauth/l10n/tr.php +++ b/apps/user_webdavauth/l10n/tr.php @@ -1,3 +1,3 @@ "WebDAV URL: http://" +"URL: http://" => "URL: http://" ); diff --git a/core/l10n/ro.php b/core/l10n/ro.php index 053c59330bd..1c58e5fe2be 100644 --- a/core/l10n/ro.php +++ b/core/l10n/ro.php @@ -1,13 +1,17 @@ "Tipul de categorie nu este prevazut", "No category to add?" => "Nici o categorie de adăugat?", "This category already exists: " => "Această categorie deja există:", +"Object type not provided." => "Tipul obiectului nu este prevazut", "No categories selected for deletion." => "Nici o categorie selectată pentru ștergere.", "Settings" => "Configurări", "seconds ago" => "secunde în urmă", "1 minute ago" => "1 minut în urmă", +"{minutes} minutes ago" => "{minutes} minute in urma", "1 hour ago" => "Acum o ora", "today" => "astăzi", "yesterday" => "ieri", +"{days} days ago" => "{days} zile in urma", "last month" => "ultima lună", "months ago" => "luni în urmă", "last year" => "ultimul an", @@ -21,14 +25,18 @@ "Error while sharing" => "Eroare la partajare", "Error while unsharing" => "Eroare la anularea partajării", "Error while changing permissions" => "Eroare la modificarea permisiunilor", +"Shared with you and the group {group} by {owner}" => "Distribuie cu tine si grupul {group} de {owner}", +"Shared with you by {owner}" => "Distribuie cu tine de {owner}", "Share with" => "Partajat cu", "Share with link" => "Partajare cu legătură", "Password protect" => "Protejare cu parolă", "Password" => "Parola", "Set expiration date" => "Specifică data expirării", "Expiration date" => "Data expirării", +"Share via email:" => "Distribuie prin email:", "No people found" => "Nici o persoană găsită", "Resharing is not allowed" => "Repartajarea nu este permisă", +"Shared in {item} with {user}" => "Distribuie in {item} si {user}", "Unshare" => "Anulare partajare", "can edit" => "poate edita", "access control" => "control acces", @@ -42,6 +50,8 @@ "ownCloud password reset" => "Resetarea parolei ownCloud ", "Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}", "You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email", +"Reset email send." => "Resetarea emailu-lui trimisa.", +"Request failed!" => "Solicitarea nu a reusit", "Username" => "Utilizator", "Request reset" => "Cerere trimisă", "Your password was reset" => "Parola a fost resetată", @@ -58,6 +68,8 @@ "Edit categories" => "Editează categoriile", "Add" => "Adaugă", "Security Warning" => "Avertisment de securitate", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Generatorul de numere pentru securitate nu este disponibil, va rog activati extensia PHP OpenSSL", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Fara generatorul pentru numere de securitate , un atacator poate afla parola si reseta contul tau", "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." => "Directorul tău de date și fișierele tale probabil sunt accesibile prin internet. Fișierul .htaccess oferit de ownCloud nu funcționează. Îți recomandăm să configurezi server-ul tău web într-un mod în care directorul de date să nu mai fie accesibil sau mută directorul de date în afara directorului root al server-ului web.", "Create an admin account" => "Crează un cont de administrator", "Advanced" => "Avansat", @@ -91,10 +103,16 @@ "December" => "Decembrie", "web services under your control" => "servicii web controlate de tine", "Log out" => "Ieșire", +"Automatic logon rejected!" => "Logare automata respinsa", +"If you did not change your password recently, your account may be compromised!" => "Daca nu schimbi parola cand de curand , contul tau poate fi conpromis", +"Please change your password to secure your account again." => "Te rog schimba parola pentru ca, contul tau sa fie securizat din nou.", "Lost your password?" => "Ai uitat parola?", "remember" => "amintește", "Log in" => "Autentificare", "You are logged out." => "Ai ieșit", "prev" => "precedentul", -"next" => "următorul" +"next" => "următorul", +"Security Warning!" => "Advertisment de Securitate", +"Please verify your password.
For security reasons you may be occasionally asked to enter your password again." => "Te rog verifica parola.
Pentru securitate va poate fi cerut ocazional introducerea parolei din nou", +"Verify" => "Verifica" ); diff --git a/core/l10n/tr.php b/core/l10n/tr.php index cb0df023993..86036e5ebd1 100644 --- a/core/l10n/tr.php +++ b/core/l10n/tr.php @@ -1,25 +1,57 @@ "Kategori türü desteklenmemektedir.", "No category to add?" => "Eklenecek kategori yok?", "This category already exists: " => "Bu kategori zaten mevcut: ", +"Object type not provided." => "Nesne türü desteklenmemektedir.", "No categories selected for deletion." => "Silmek için bir kategori seçilmedi", "Settings" => "Ayarlar", +"seconds ago" => "saniye önce", +"1 minute ago" => "1 dakika önce", +"{minutes} minutes ago" => "{minutes} dakika önce", +"1 hour ago" => "1 saat önce", +"{hours} hours ago" => "{hours} saat önce", +"today" => "bugün", +"yesterday" => "dün", +"{days} days ago" => "{days} gün önce", +"last month" => "geçen ay", +"{months} months ago" => "{months} ay önce", +"months ago" => "ay önce", +"last year" => "geçen yıl", +"years ago" => "yıl önce", "Choose" => "seç", "Cancel" => "İptal", "No" => "Hayır", "Yes" => "Evet", "Ok" => "Tamam", +"The object type is not specified." => "Nesne türü belirtilmemiş.", "Error" => "Hata", "Error while sharing" => "Paylaşım sırasında hata ", +"Error while changing permissions" => "İzinleri değiştirirken hata oluştu", "Share with" => "ile Paylaş", "Share with link" => "Bağlantı ile paylaş", "Password protect" => "Şifre korunması", "Password" => "Parola", +"Send" => "Gönder", "Set expiration date" => "Son kullanma tarihini ayarla", +"Expiration date" => "Son kullanım tarihi", +"Share via email:" => "Eposta ile paylaş", +"No people found" => "Kişi bulunamadı", +"Resharing is not allowed" => "Tekrar paylaşmaya izin verilmiyor", "Unshare" => "Paylaşılmayan", +"can edit" => "düzenleyebilir", +"access control" => "erişim kontrolü", "create" => "oluştur", +"update" => "güncelle", +"delete" => "sil", +"share" => "paylaş", +"Password protected" => "Paralo korumalı", +"Sending ..." => "Gönderiliyor...", +"Email sent" => "Eposta gönderildi", "ownCloud password reset" => "ownCloud parola sıfırlama", "Use the following link to reset your password: {link}" => "Bu bağlantıyı kullanarak parolanızı sıfırlayın: {link}", "You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilecek.", +"Reset email send." => "Sıfırlama epostası gönderildi.", +"Request failed!" => "İstek reddedildi!", "Username" => "Kullanıcı adı", "Request reset" => "Sıfırlama iste", "Your password was reset" => "Parolanız sıfırlandı", @@ -68,10 +100,13 @@ "December" => "Aralık", "web services under your control" => "kontrolünüzdeki web servisleri", "Log out" => "Çıkış yap", +"Automatic logon rejected!" => "Otomatik oturum açma reddedildi!", "Lost your password?" => "Parolanızı mı unuttunuz?", "remember" => "hatırla", "Log in" => "Giriş yap", "You are logged out." => "Çıkış yaptınız.", "prev" => "önceki", -"next" => "sonraki" +"next" => "sonraki", +"Security Warning!" => "Güvenlik Uyarısı!", +"Verify" => "Doğrula" ); diff --git a/l10n/el/files.po b/l10n/el/files.po index 85209f363a5..5129f6e33ff 100644 --- a/l10n/el/files.po +++ b/l10n/el/files.po @@ -6,6 +6,7 @@ # Dimitris M. , 2012. # Efstathios Iosifidis , 2012. # Efstathios Iosifidis , 2012. +# Konstantinos Tzanidis , 2012. # Marios Bekatoros <>, 2012. # Petros Kyladitis , 2011-2012. # Γιάννης Ανθυμίδης , 2012. @@ -13,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-03 00:04+0100\n" -"PO-Revision-Date: 2012-12-02 11:20+0000\n" -"Last-Translator: Efstathios Iosifidis \n" +"POT-Creation-Date: 2012-12-28 00:20+0100\n" +"PO-Revision-Date: 2012-12-27 13:50+0000\n" +"Last-Translator: Konstantinos Tzanidis \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" @@ -58,11 +59,11 @@ msgstr "Αποτυχία εγγραφής στο δίσκο" msgid "Files" msgstr "Αρχεία" -#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84 +#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85 msgid "Unshare" msgstr "Διακοπή κοινής χρήσης" -#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90 +#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91 msgid "Delete" msgstr "Διαγραφή" @@ -70,39 +71,39 @@ msgstr "Διαγραφή" msgid "Rename" msgstr "Μετονομασία" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "{new_name} already exists" msgstr "{new_name} υπάρχει ήδη" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "replace" msgstr "αντικατέστησε" -#: js/filelist.js:201 +#: js/filelist.js:199 msgid "suggest name" msgstr "συνιστώμενο όνομα" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "cancel" msgstr "ακύρωση" -#: js/filelist.js:250 +#: js/filelist.js:248 msgid "replaced {new_name}" msgstr "{new_name} αντικαταστάθηκε" -#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286 +#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284 msgid "undo" msgstr "αναίρεση" -#: js/filelist.js:252 +#: js/filelist.js:250 msgid "replaced {new_name} with {old_name}" msgstr "αντικαταστάθηκε το {new_name} με {old_name}" -#: js/filelist.js:284 +#: js/filelist.js:282 msgid "unshared {files}" msgstr "μη διαμοιρασμένα {files}" -#: js/filelist.js:286 +#: js/filelist.js:284 msgid "deleted {files}" msgstr "διαγραμμένα {files}" @@ -112,80 +113,80 @@ msgid "" "allowed." msgstr "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται." -#: js/files.js:183 +#: js/files.js:174 msgid "generating ZIP-file, it may take some time." msgstr "παραγωγή αρχείου ZIP, ίσως διαρκέσει αρκετά." -#: js/files.js:218 +#: js/files.js:212 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Αδυναμία στην αποστολή του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes" -#: js/files.js:218 +#: js/files.js:212 msgid "Upload Error" msgstr "Σφάλμα Αποστολής" -#: js/files.js:235 +#: js/files.js:229 msgid "Close" msgstr "Κλείσιμο" -#: js/files.js:254 js/files.js:368 js/files.js:398 +#: js/files.js:248 js/files.js:362 js/files.js:392 msgid "Pending" msgstr "Εκκρεμεί" -#: js/files.js:274 +#: js/files.js:268 msgid "1 file uploading" msgstr "1 αρχείο ανεβαίνει" -#: js/files.js:277 js/files.js:331 js/files.js:346 +#: js/files.js:271 js/files.js:325 js/files.js:340 msgid "{count} files uploading" msgstr "{count} αρχεία ανεβαίνουν" -#: js/files.js:349 js/files.js:382 +#: js/files.js:343 js/files.js:376 msgid "Upload cancelled." msgstr "Η αποστολή ακυρώθηκε." -#: js/files.js:451 +#: js/files.js:445 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." -msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Έξοδος από την σελίδα τώρα θα ακυρώσει την αποστολή." +msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή." -#: js/files.js:523 +#: js/files.js:515 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του \"Shared\" είναι δεσμευμένη από το Owncloud" -#: js/files.js:704 +#: js/files.js:699 msgid "{count} files scanned" msgstr "{count} αρχεία ανιχνεύτηκαν" -#: js/files.js:712 +#: js/files.js:707 msgid "error while scanning" msgstr "σφάλμα κατά την ανίχνευση" -#: js/files.js:785 templates/index.php:65 +#: js/files.js:780 templates/index.php:66 msgid "Name" msgstr "Όνομα" -#: js/files.js:786 templates/index.php:76 +#: js/files.js:781 templates/index.php:77 msgid "Size" msgstr "Μέγεθος" -#: js/files.js:787 templates/index.php:78 +#: js/files.js:782 templates/index.php:79 msgid "Modified" msgstr "Τροποποιήθηκε" -#: js/files.js:814 +#: js/files.js:801 msgid "1 folder" msgstr "1 φάκελος" -#: js/files.js:816 +#: js/files.js:803 msgid "{count} folders" msgstr "{count} φάκελοι" -#: js/files.js:824 +#: js/files.js:811 msgid "1 file" msgstr "1 αρχείο" -#: js/files.js:826 +#: js/files.js:813 msgid "{count} files" msgstr "{count} αρχεία" @@ -245,28 +246,28 @@ msgstr "Αποστολή" msgid "Cancel upload" msgstr "Ακύρωση αποστολής" -#: templates/index.php:57 +#: templates/index.php:58 msgid "Nothing in here. Upload something!" msgstr "Δεν υπάρχει τίποτα εδώ. Ανέβασε κάτι!" -#: templates/index.php:71 +#: templates/index.php:72 msgid "Download" msgstr "Λήψη" -#: templates/index.php:103 +#: templates/index.php:104 msgid "Upload too large" msgstr "Πολύ μεγάλο αρχείο προς αποστολή" -#: templates/index.php:105 +#: templates/index.php:106 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." -msgstr "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν το διακομιστή." +msgstr "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή." -#: templates/index.php:110 +#: templates/index.php:111 msgid "Files are being scanned, please wait." msgstr "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε" -#: templates/index.php:113 +#: templates/index.php:114 msgid "Current scanning" msgstr "Τρέχουσα αναζήτηση " diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po index 3cbbac049eb..14b7e75c710 100644 --- a/l10n/el/user_ldap.po +++ b/l10n/el/user_ldap.po @@ -6,14 +6,15 @@ # , 2012. # Dimitris M. , 2012. # Efstathios Iosifidis , 2012. +# Konstantinos Tzanidis , 2012. # Marios Bekatoros <>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-27 00:04+0100\n" -"PO-Revision-Date: 2012-12-26 17:22+0000\n" -"Last-Translator: AnAstAsiA \n" +"POT-Creation-Date: 2012-12-28 00:20+0100\n" +"PO-Revision-Date: 2012-12-27 14:12+0000\n" +"Last-Translator: Konstantinos Tzanidis \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" @@ -26,22 +27,22 @@ 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 "Προσοχή: Οι εφαρμογές user_ldap και user_webdavauth είναι ασύμβατες. Μπορεί να αντιμετωπίσετε απρόβλεπτη συμπεριφορά. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να απενεργοποιήσει μία από αυτές." #: templates/settings.php:11 msgid "" "Warning: The PHP LDAP module needs is not installed, the backend will" " not work. Please ask your system administrator to install it." -msgstr "" +msgstr "Προσοχή: Το PHP LDAP module που απαιτείται δεν είναι εγκατεστημένο και ο μηχανισμός δεν θα λειτουργήσει. Παρακαλώ ζητήστε από τον διαχειριστή του συστήματος να το εγκαταστήσει." #: templates/settings.php:15 msgid "Host" -msgstr "" +msgstr "Διακομιστής" #: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" -msgstr "" +msgstr "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://" #: templates/settings.php:16 msgid "Base DN" @@ -60,7 +61,7 @@ msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." -msgstr "" +msgstr "Το DN του χρήστη πελάτη με το οποίο θα πρέπει να γίνει η σύνδεση, π.χ. uid=agent,dc=example,dc=com. Για χρήση χωρίς πιστοποίηση, αφήστε το DN και τον Κωδικό κενά." #: templates/settings.php:18 msgid "Password" @@ -84,7 +85,7 @@ msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά #: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" -msgstr "" +msgstr "χρησιμοποιήστε τη μεταβλητή %%uid, π.χ. \"uid=%%uid\"" #: templates/settings.php:20 msgid "User List Filter" @@ -96,7 +97,7 @@ msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά #: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." -msgstr "" +msgstr "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=άτομο\"." #: templates/settings.php:21 msgid "Group Filter" @@ -108,7 +109,7 @@ msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά #: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." -msgstr "" +msgstr "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=ΟμάδαPosix\"." #: templates/settings.php:24 msgid "Port" @@ -136,7 +137,7 @@ msgstr "Μην χρησιμοποιείτε για συνδέσεις SSL, θα #: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" -msgstr "" +msgstr "LDAP server (Windows) με διάκριση πεζών-ΚΕΦΑΛΑΙΩΝ" #: templates/settings.php:30 msgid "Turn off SSL certificate validation." @@ -146,7 +147,7 @@ msgstr "Απενεργοποίηση επικύρωσης πιστοποιητι msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." -msgstr "" +msgstr "Εάν η σύνδεση δουλεύει μόνο με αυτή την επιλογή, εισάγετε το LDAP SSL πιστοποιητικό του διακομιστή στον ownCloud server σας." #: templates/settings.php:30 msgid "Not recommended, use for testing only." @@ -158,7 +159,7 @@ msgstr "Πεδίο Ονόματος Χρήστη" #: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." -msgstr "" +msgstr "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος χρήστη του ownCloud." #: templates/settings.php:32 msgid "Group Display Name Field" @@ -166,7 +167,7 @@ msgstr "Group Display Name Field" #: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." -msgstr "" +msgstr "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος ομάδας του ownCloud." #: templates/settings.php:34 msgid "in bytes" @@ -180,7 +181,7 @@ msgstr "σε δευτερόλεπτα. Μια αλλαγή αδειάζει τη msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." -msgstr "" +msgstr "Αφήστε το κενό για το όνομα χρήστη (προεπιλογή). Διαφορετικά, συμπληρώστε μία ιδιότητα LDAP/AD." #: templates/settings.php:39 msgid "Help" diff --git a/l10n/el/user_webdavauth.po b/l10n/el/user_webdavauth.po index cbfe15b5525..dff8dd88f35 100644 --- a/l10n/el/user_webdavauth.po +++ b/l10n/el/user_webdavauth.po @@ -5,13 +5,14 @@ # Translators: # Dimitris M. , 2012. # Efstathios Iosifidis , 2012. +# Konstantinos Tzanidis , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-22 00:24+0100\n" -"PO-Revision-Date: 2012-12-21 13:00+0000\n" -"Last-Translator: Efstathios Iosifidis \n" +"POT-Creation-Date: 2012-12-28 00:20+0100\n" +"PO-Revision-Date: 2012-12-27 13:55+0000\n" +"Last-Translator: Konstantinos Tzanidis \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" @@ -28,4 +29,4 @@ msgid "" "ownCloud will send the user credentials to this URL is interpret http 401 " "and http 403 as credentials wrong and all other codes as credentials " "correct." -msgstr "" +msgstr "Το ownCloud θα στείλει τα συνθηματικά χρήστη σε αυτό το URL, μεταφράζοντας τα http 401 και http 403 ως λανθασμένα συνθηματικά και όλους τους άλλους κωδικούς ως σωστά συνθηματικά." diff --git a/l10n/eo/user_webdavauth.po b/l10n/eo/user_webdavauth.po index d3ca981d96d..60a766ad4c7 100644 --- a/l10n/eo/user_webdavauth.po +++ b/l10n/eo/user_webdavauth.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:12+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-28 00:20+0100\n" +"PO-Revision-Date: 2012-12-27 03:35+0000\n" +"Last-Translator: Mariano \n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +20,7 @@ msgstr "" #: templates/settings.php:4 msgid "URL: http://" -msgstr "" +msgstr "URL: http://" #: templates/settings.php:6 msgid "" diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po index 70742445f54..285a6bad98d 100644 --- a/l10n/eu/files_external.po +++ b/l10n/eu/files_external.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-11 23:22+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-28 00:20+0100\n" +"PO-Revision-Date: 2012-12-27 20:50+0000\n" +"Last-Translator: asieriko \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" @@ -46,14 +46,14 @@ msgstr "Errore bat egon da Google Drive biltegiratzea konfiguratzean" msgid "" "Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Abisua: \"smbclient\" ez dago instalatuta. CIFS/SMB partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea." #: lib/config.php:435 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 "Abisua: PHPren FTP modulua ez dago instalatuta edo gaitua. FTP partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea." #: templates/settings.php:3 msgid "External Storage" @@ -100,7 +100,7 @@ msgid "Users" msgstr "Erabiltzaileak" #: 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 "Ezabatu" @@ -112,10 +112,10 @@ msgstr "Gaitu erabiltzaileentzako Kanpo Biltegiratzea" msgid "Allow users to mount their own external storage" msgstr "Baimendu erabiltzaileak bere kanpo biltegiratzeak muntatzen" -#: templates/settings.php:139 +#: templates/settings.php:136 msgid "SSL root certificates" msgstr "SSL erro ziurtagiriak" -#: templates/settings.php:158 +#: templates/settings.php:153 msgid "Import Root Certificate" msgstr "Inportatu Erro Ziurtagiria" diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po index 93231c3514a..88627e3567b 100644 --- a/l10n/eu/settings.po +++ b/l10n/eu/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-28 00:20+0100\n" +"PO-Revision-Date: 2012-12-27 20:53+0000\n" +"Last-Translator: asieriko \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" @@ -120,27 +120,27 @@ msgstr "-lizentziatua \n" +"POT-Creation-Date: 2012-12-28 00:20+0100\n" +"PO-Revision-Date: 2012-12-27 20:38+0000\n" +"Last-Translator: asieriko \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" @@ -23,13 +23,13 @@ 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 "Abisua: user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko." #: templates/settings.php:11 msgid "" "Warning: The PHP LDAP module needs is not installed, the backend will" " not work. Please ask your system administrator to install it." -msgstr "" +msgstr "Abisua: PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan." #: templates/settings.php:15 msgid "Host" diff --git a/l10n/eu/user_webdavauth.po b/l10n/eu/user_webdavauth.po index b7e5b1a0d37..0f039352404 100644 --- a/l10n/eu/user_webdavauth.po +++ b/l10n/eu/user_webdavauth.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:12+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-28 00:20+0100\n" +"PO-Revision-Date: 2012-12-27 20:58+0000\n" +"Last-Translator: asieriko \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" @@ -20,11 +20,11 @@ msgstr "" #: templates/settings.php:4 msgid "URL: http://" -msgstr "" +msgstr "URL: http://" #: templates/settings.php:6 msgid "" "ownCloud will send the user credentials to this URL is interpret http 401 " "and http 403 as credentials wrong and all other codes as credentials " "correct." -msgstr "" +msgstr "ownCloud erabiltzailearen kredentzialak helbide honetara bidaliko ditu. http 401 eta http 403 kredentzial ez zuzenak bezala hartuko dira eta beste kode guztiak kredentzial zuzentzat hartuko dira." diff --git a/l10n/ro/core.po b/l10n/ro/core.po index 6abd9e8372a..1596bc408e3 100644 --- a/l10n/ro/core.po +++ b/l10n/ro/core.po @@ -7,13 +7,14 @@ # Dimon Pockemon <>, 2012. # Eugen Mihalache , 2012. # , 2012. +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-27 00:04+0100\n" -"PO-Revision-Date: 2012-12-26 05:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-28 00:20+0100\n" +"PO-Revision-Date: 2012-12-27 00:19+0000\n" +"Last-Translator: laurentiucristescu \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -47,7 +48,7 @@ msgstr "" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." -msgstr "" +msgstr "Tipul de categorie nu este prevazut" #: ajax/vcategories/add.php:30 msgid "No category to add?" @@ -61,7 +62,7 @@ msgstr "Această categorie deja există:" #: ajax/vcategories/favorites.php:24 #: ajax/vcategories/removeFromFavorites.php:26 msgid "Object type not provided." -msgstr "" +msgstr "Tipul obiectului nu este prevazut" #: ajax/vcategories/addToFavorites.php:30 #: ajax/vcategories/removeFromFavorites.php:30 @@ -97,7 +98,7 @@ msgstr "1 minut în urmă" #: js/js.js:706 msgid "{minutes} minutes ago" -msgstr "" +msgstr "{minutes} minute in urma" #: js/js.js:707 msgid "1 hour ago" @@ -117,7 +118,7 @@ msgstr "ieri" #: js/js.js:711 msgid "{days} days ago" -msgstr "" +msgstr "{days} zile in urma" #: js/js.js:712 msgid "last month" @@ -192,11 +193,11 @@ msgstr "Eroare la modificarea permisiunilor" #: js/share.js:151 msgid "Shared with you and the group {group} by {owner}" -msgstr "" +msgstr "Distribuie cu tine si grupul {group} de {owner}" #: js/share.js:153 msgid "Shared with you by {owner}" -msgstr "" +msgstr "Distribuie cu tine de {owner}" #: js/share.js:158 msgid "Share with" @@ -233,7 +234,7 @@ msgstr "Data expirării" #: js/share.js:210 msgid "Share via email:" -msgstr "" +msgstr "Distribuie prin email:" #: js/share.js:212 msgid "No people found" @@ -245,7 +246,7 @@ msgstr "Repartajarea nu este permisă" #: js/share.js:275 msgid "Shared in {item} with {user}" -msgstr "" +msgstr "Distribuie in {item} si {user}" #: js/share.js:296 msgid "Unshare" @@ -309,11 +310,11 @@ msgstr "Vei primi un mesaj prin care vei putea reseta parola via email" #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "Resetarea emailu-lui trimisa." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "Solicitarea nu a reusit" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 #: templates/login.php:28 @@ -384,13 +385,13 @@ msgstr "Avertisment de securitate" msgid "" "No secure random number generator is available, please enable the PHP " "OpenSSL extension." -msgstr "" +msgstr "Generatorul de numere pentru securitate nu este disponibil, va rog activati extensia PHP OpenSSL" #: templates/installation.php:26 msgid "" "Without a secure random number generator an attacker may be able to predict " "password reset tokens and take over your account." -msgstr "" +msgstr "Fara generatorul pentru numere de securitate , un atacator poate afla parola si reseta contul tau" #: templates/installation.php:32 msgid "" @@ -532,17 +533,17 @@ msgstr "Ieșire" #: templates/login.php:10 msgid "Automatic logon rejected!" -msgstr "" +msgstr "Logare automata respinsa" #: templates/login.php:11 msgid "" "If you did not change your password recently, your account may be " "compromised!" -msgstr "" +msgstr "Daca nu schimbi parola cand de curand , contul tau poate fi conpromis" #: templates/login.php:13 msgid "Please change your password to secure your account again." -msgstr "" +msgstr "Te rog schimba parola pentru ca, contul tau sa fie securizat din nou." #: templates/login.php:19 msgid "Lost your password?" @@ -570,14 +571,14 @@ msgstr "următorul" #: templates/verify.php:5 msgid "Security Warning!" -msgstr "" +msgstr "Advertisment de Securitate" #: templates/verify.php:6 msgid "" "Please verify your password.
For security reasons you may be " "occasionally asked to enter your password again." -msgstr "" +msgstr "Te rog verifica parola.
Pentru securitate va poate fi cerut ocazional introducerea parolei din nou" #: templates/verify.php:16 msgid "Verify" -msgstr "" +msgstr "Verifica" diff --git a/l10n/ro/files.po b/l10n/ro/files.po index a1bd981cb9b..d61dc617703 100644 --- a/l10n/ro/files.po +++ b/l10n/ro/files.po @@ -7,13 +7,14 @@ # Dimon Pockemon <>, 2012. # Eugen Mihalache , 2012. # , 2012. +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-01 00:01+0100\n" -"PO-Revision-Date: 2012-11-30 23:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-28 00:20+0100\n" +"PO-Revision-Date: 2012-12-27 00:09+0000\n" +"Last-Translator: laurentiucristescu \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +29,7 @@ msgstr "Nicio eroare, fișierul a fost încărcat cu succes" #: ajax/upload.php:21 msgid "" "The uploaded file exceeds the upload_max_filesize directive in php.ini: " -msgstr "" +msgstr "Fisierul incarcat depaseste upload_max_filesize permisi in php.ini: " #: ajax/upload.php:23 msgid "" @@ -56,11 +57,11 @@ msgstr "Eroare la scriere pe disc" msgid "Files" msgstr "Fișiere" -#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84 +#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85 msgid "Unshare" msgstr "Anulează partajarea" -#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90 +#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91 msgid "Delete" msgstr "Șterge" @@ -68,124 +69,124 @@ msgstr "Șterge" msgid "Rename" msgstr "Redenumire" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "{new_name} already exists" -msgstr "" +msgstr "{new_name} deja exista" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "replace" msgstr "înlocuire" -#: js/filelist.js:201 +#: js/filelist.js:199 msgid "suggest name" msgstr "sugerează nume" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "cancel" msgstr "anulare" -#: js/filelist.js:250 +#: js/filelist.js:248 msgid "replaced {new_name}" -msgstr "" +msgstr "inlocuit {new_name}" -#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286 +#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284 msgid "undo" msgstr "Anulează ultima acțiune" -#: js/filelist.js:252 +#: js/filelist.js:250 msgid "replaced {new_name} with {old_name}" -msgstr "" +msgstr "{new_name} inlocuit cu {old_name}" -#: js/filelist.js:284 +#: js/filelist.js:282 msgid "unshared {files}" -msgstr "" +msgstr "nedistribuit {files}" -#: js/filelist.js:286 +#: js/filelist.js:284 msgid "deleted {files}" -msgstr "" +msgstr "Sterse {files}" #: js/files.js:33 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "Nume invalid, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise." -#: js/files.js:183 +#: js/files.js:174 msgid "generating ZIP-file, it may take some time." msgstr "se generază fișierul ZIP, va dura ceva timp." -#: js/files.js:218 +#: js/files.js:212 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes." -#: js/files.js:218 +#: js/files.js:212 msgid "Upload Error" msgstr "Eroare la încărcare" -#: js/files.js:235 +#: js/files.js:229 msgid "Close" msgstr "Închide" -#: js/files.js:254 js/files.js:368 js/files.js:398 +#: js/files.js:248 js/files.js:362 js/files.js:392 msgid "Pending" msgstr "În așteptare" -#: js/files.js:274 +#: js/files.js:268 msgid "1 file uploading" msgstr "un fișier se încarcă" -#: js/files.js:277 js/files.js:331 js/files.js:346 +#: js/files.js:271 js/files.js:325 js/files.js:340 msgid "{count} files uploading" -msgstr "" +msgstr "{count} fisiere incarcate" -#: js/files.js:349 js/files.js:382 +#: js/files.js:343 js/files.js:376 msgid "Upload cancelled." msgstr "Încărcare anulată." -#: js/files.js:451 +#: js/files.js:445 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea." -#: js/files.js:523 +#: js/files.js:515 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" -msgstr "" +msgstr "Nume de folder invalid. Numele este rezervat pentru OwnCloud" -#: js/files.js:704 +#: js/files.js:699 msgid "{count} files scanned" -msgstr "" +msgstr "{count} fisiere scanate" -#: js/files.js:712 +#: js/files.js:707 msgid "error while scanning" msgstr "eroare la scanarea" -#: js/files.js:785 templates/index.php:65 +#: js/files.js:780 templates/index.php:66 msgid "Name" msgstr "Nume" -#: js/files.js:786 templates/index.php:76 +#: js/files.js:781 templates/index.php:77 msgid "Size" msgstr "Dimensiune" -#: js/files.js:787 templates/index.php:78 +#: js/files.js:782 templates/index.php:79 msgid "Modified" msgstr "Modificat" -#: js/files.js:814 +#: js/files.js:801 msgid "1 folder" -msgstr "" +msgstr "1 folder" -#: js/files.js:816 +#: js/files.js:803 msgid "{count} folders" -msgstr "" +msgstr "{count} foldare" -#: js/files.js:824 +#: js/files.js:811 msgid "1 file" -msgstr "" +msgstr "1 fisier" -#: js/files.js:826 +#: js/files.js:813 msgid "{count} files" -msgstr "" +msgstr "{count} fisiere" #: templates/admin.php:5 msgid "File handling" @@ -233,7 +234,7 @@ msgstr "Dosar" #: templates/index.php:14 msgid "From link" -msgstr "" +msgstr "de la adresa" #: templates/index.php:35 msgid "Upload" @@ -243,28 +244,28 @@ msgstr "Încarcă" msgid "Cancel upload" msgstr "Anulează încărcarea" -#: templates/index.php:57 +#: templates/index.php:58 msgid "Nothing in here. Upload something!" msgstr "Nimic aici. Încarcă ceva!" -#: templates/index.php:71 +#: templates/index.php:72 msgid "Download" msgstr "Descarcă" -#: templates/index.php:103 +#: templates/index.php:104 msgid "Upload too large" msgstr "Fișierul încărcat este prea mare" -#: templates/index.php:105 +#: templates/index.php:106 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server." -#: templates/index.php:110 +#: templates/index.php:111 msgid "Files are being scanned, please wait." msgstr "Fișierele sunt scanate, te rog așteptă." -#: templates/index.php:113 +#: templates/index.php:114 msgid "Current scanning" msgstr "În curs de scanare" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index bb50657d0c1..8a6967f1039 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-27 00:04+0100\n" +"POT-Creation-Date: 2012-12-28 00:20+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.pot b/l10n/templates/files.pot index 03098019637..823a2e3bdec 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-27 00:04+0100\n" +"POT-Creation-Date: 2012-12-28 00:20+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_encryption.pot b/l10n/templates/files_encryption.pot index 6eef8177d08..a3187ebb1e8 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-27 00:04+0100\n" +"POT-Creation-Date: 2012-12-28 00:20+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 ede827aedaf..87b8656333a 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-27 00:04+0100\n" +"POT-Creation-Date: 2012-12-28 00:20+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 56f4c1b25fa..db5e099fcd8 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-27 00:04+0100\n" +"POT-Creation-Date: 2012-12-28 00:20+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_versions.pot b/l10n/templates/files_versions.pot index c93f0198ea2..4b785107bda 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-27 00:04+0100\n" +"POT-Creation-Date: 2012-12-28 00:20+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 542c822edcd..cc72f66e0c5 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-27 00:04+0100\n" +"POT-Creation-Date: 2012-12-28 00:20+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 e2ebf0bd789..cb229fa6af5 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-27 00:04+0100\n" +"POT-Creation-Date: 2012-12-28 00:20+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 1beb1526e1c..ca0af23788f 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-27 00:04+0100\n" +"POT-Creation-Date: 2012-12-28 00:20+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 2de8510b34f..79fbcb66c38 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-27 00:04+0100\n" +"POT-Creation-Date: 2012-12-28 00:20+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/tr/core.po b/l10n/tr/core.po index 7c575fd5a3b..7058a258c8a 100644 --- a/l10n/tr/core.po +++ b/l10n/tr/core.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-12 23:17+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-28 00:20+0100\n" +"PO-Revision-Date: 2012-12-27 12:25+0000\n" +"Last-Translator: Necdet Yücel \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" @@ -47,7 +47,7 @@ msgstr "" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." -msgstr "" +msgstr "Kategori türü desteklenmemektedir." #: ajax/vcategories/add.php:30 msgid "No category to add?" @@ -61,7 +61,7 @@ msgstr "Bu kategori zaten mevcut: " #: ajax/vcategories/favorites.php:24 #: ajax/vcategories/removeFromFavorites.php:26 msgid "Object type not provided." -msgstr "" +msgstr "Nesne türü desteklenmemektedir." #: ajax/vcategories/addToFavorites.php:30 #: ajax/vcategories/removeFromFavorites.php:30 @@ -89,55 +89,55 @@ msgstr "Ayarlar" #: js/js.js:704 msgid "seconds ago" -msgstr "" +msgstr "saniye önce" #: js/js.js:705 msgid "1 minute ago" -msgstr "" +msgstr "1 dakika önce" #: js/js.js:706 msgid "{minutes} minutes ago" -msgstr "" +msgstr "{minutes} dakika önce" #: js/js.js:707 msgid "1 hour ago" -msgstr "" +msgstr "1 saat önce" #: js/js.js:708 msgid "{hours} hours ago" -msgstr "" +msgstr "{hours} saat önce" #: js/js.js:709 msgid "today" -msgstr "" +msgstr "bugün" #: js/js.js:710 msgid "yesterday" -msgstr "" +msgstr "dün" #: js/js.js:711 msgid "{days} days ago" -msgstr "" +msgstr "{days} gün önce" #: js/js.js:712 msgid "last month" -msgstr "" +msgstr "geçen ay" #: js/js.js:713 msgid "{months} months ago" -msgstr "" +msgstr "{months} ay önce" #: js/js.js:714 msgid "months ago" -msgstr "" +msgstr "ay önce" #: js/js.js:715 msgid "last year" -msgstr "" +msgstr "geçen yıl" #: js/js.js:716 msgid "years ago" -msgstr "" +msgstr "yıl önce" #: js/oc-dialogs.js:126 msgid "Choose" @@ -162,11 +162,11 @@ msgstr "Tamam" #: 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 "" +msgstr "Nesne türü belirtilmemiş." #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 -#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541 -#: js/share.js:553 +#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554 +#: js/share.js:566 msgid "Error" msgstr "Hata" @@ -178,7 +178,7 @@ msgstr "" msgid "The required file {file} is not installed!" msgstr "" -#: js/share.js:124 js/share.js:581 +#: js/share.js:124 js/share.js:594 msgid "Error while sharing" msgstr "Paylaşım sırasında hata " @@ -188,7 +188,7 @@ msgstr "" #: js/share.js:142 msgid "Error while changing permissions" -msgstr "" +msgstr "İzinleri değiştirirken hata oluştu" #: js/share.js:151 msgid "Shared with you and the group {group} by {owner}" @@ -206,11 +206,11 @@ msgstr "ile Paylaş" msgid "Share with link" msgstr "Bağlantı ile paylaş" -#: js/share.js:164 +#: js/share.js:166 msgid "Password protect" msgstr "Şifre korunması" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:35 #: templates/verify.php:13 msgid "Password" msgstr "Parola" @@ -221,7 +221,7 @@ msgstr "" #: js/share.js:173 msgid "Send" -msgstr "" +msgstr "Gönder" #: js/share.js:177 msgid "Set expiration date" @@ -229,19 +229,19 @@ msgstr "Son kullanma tarihini ayarla" #: js/share.js:178 msgid "Expiration date" -msgstr "" +msgstr "Son kullanım tarihi" #: js/share.js:210 msgid "Share via email:" -msgstr "" +msgstr "Eposta ile paylaş" #: js/share.js:212 msgid "No people found" -msgstr "" +msgstr "Kişi bulunamadı" #: js/share.js:239 msgid "Resharing is not allowed" -msgstr "" +msgstr "Tekrar paylaşmaya izin verilmiyor" #: js/share.js:275 msgid "Shared in {item} with {user}" @@ -253,11 +253,11 @@ msgstr "Paylaşılmayan" #: js/share.js:308 msgid "can edit" -msgstr "" +msgstr "düzenleyebilir" #: js/share.js:310 msgid "access control" -msgstr "" +msgstr "erişim kontrolü" #: js/share.js:313 msgid "create" @@ -265,35 +265,35 @@ msgstr "oluştur" #: js/share.js:316 msgid "update" -msgstr "" +msgstr "güncelle" #: js/share.js:319 msgid "delete" -msgstr "" +msgstr "sil" #: js/share.js:322 msgid "share" -msgstr "" +msgstr "paylaş" -#: js/share.js:353 js/share.js:528 js/share.js:530 +#: js/share.js:356 js/share.js:541 msgid "Password protected" -msgstr "" +msgstr "Paralo korumalı" -#: js/share.js:541 +#: js/share.js:554 msgid "Error unsetting expiration date" msgstr "" -#: js/share.js:553 +#: js/share.js:566 msgid "Error setting expiration date" msgstr "" -#: js/share.js:568 +#: js/share.js:581 msgid "Sending ..." -msgstr "" +msgstr "Gönderiliyor..." -#: js/share.js:579 +#: js/share.js:592 msgid "Email sent" -msgstr "" +msgstr "Eposta gönderildi" #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -309,14 +309,14 @@ msgstr "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilec #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "Sıfırlama epostası gönderildi." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "İstek reddedildi!" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:28 msgid "Username" msgstr "Kullanıcı adı" @@ -405,44 +405,44 @@ msgstr "" msgid "Create an admin account" msgstr "Bir yönetici hesabı oluşturun" -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" msgstr "Gelişmiş" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" msgstr "Veri klasörü" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" msgstr "Veritabanını ayarla" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" msgstr "kullanılacak" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" msgstr "Veritabanı kullanıcı adı" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" msgstr "Veritabanı parolası" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" msgstr "Veritabanı adı" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" msgstr "Veritabanı tablo alanı" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" msgstr "Veritabanı sunucusu" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" msgstr "Kurulumu tamamla" @@ -530,29 +530,29 @@ msgstr "kontrolünüzdeki web servisleri" msgid "Log out" msgstr "Çıkış yap" -#: templates/login.php:8 +#: templates/login.php:10 msgid "Automatic logon rejected!" -msgstr "" +msgstr "Otomatik oturum açma reddedildi!" -#: templates/login.php:9 +#: templates/login.php:11 msgid "" "If you did not change your password recently, your account may be " "compromised!" msgstr "" -#: templates/login.php:10 +#: templates/login.php:13 msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:15 +#: templates/login.php:19 msgid "Lost your password?" msgstr "Parolanızı mı unuttunuz?" -#: templates/login.php:27 +#: templates/login.php:39 msgid "remember" msgstr "hatırla" -#: templates/login.php:28 +#: templates/login.php:41 msgid "Log in" msgstr "Giriş yap" @@ -570,7 +570,7 @@ msgstr "sonraki" #: templates/verify.php:5 msgid "Security Warning!" -msgstr "" +msgstr "Güvenlik Uyarısı!" #: templates/verify.php:6 msgid "" @@ -580,4 +580,4 @@ msgstr "" #: templates/verify.php:16 msgid "Verify" -msgstr "" +msgstr "Doğrula" diff --git a/l10n/tr/files.po b/l10n/tr/files.po index fbd322633df..bfd4390738c 100644 --- a/l10n/tr/files.po +++ b/l10n/tr/files.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-05 00:04+0100\n" -"PO-Revision-Date: 2012-12-04 11:50+0000\n" -"Last-Translator: alpere \n" +"POT-Creation-Date: 2012-12-28 00:20+0100\n" +"PO-Revision-Date: 2012-12-27 11:23+0000\n" +"Last-Translator: Necdet Yücel \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" @@ -29,7 +29,7 @@ msgstr "Bir hata yok, dosya başarıyla yüklendi" #: ajax/upload.php:21 msgid "" "The uploaded file exceeds the upload_max_filesize directive in php.ini: " -msgstr "" +msgstr "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı." #: ajax/upload.php:23 msgid "" @@ -57,11 +57,11 @@ msgstr "Diske yazılamadı" msgid "Files" msgstr "Dosyalar" -#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84 +#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85 msgid "Unshare" msgstr "Paylaşılmayan" -#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90 +#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91 msgid "Delete" msgstr "Sil" @@ -69,39 +69,39 @@ msgstr "Sil" msgid "Rename" msgstr "İsim değiştir." -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "{new_name} already exists" msgstr "{new_name} zaten mevcut" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "replace" msgstr "değiştir" -#: js/filelist.js:201 +#: js/filelist.js:199 msgid "suggest name" msgstr "Öneri ad" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "cancel" msgstr "iptal" -#: js/filelist.js:250 +#: js/filelist.js:248 msgid "replaced {new_name}" msgstr "değiştirilen {new_name}" -#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286 +#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284 msgid "undo" msgstr "geri al" -#: js/filelist.js:252 +#: js/filelist.js:250 msgid "replaced {new_name} with {old_name}" -msgstr "" +msgstr "{new_name} ismi {old_name} ile değiştirildi" -#: js/filelist.js:284 +#: js/filelist.js:282 msgid "unshared {files}" msgstr "paylaşılmamış {files}" -#: js/filelist.js:286 +#: js/filelist.js:284 msgid "deleted {files}" msgstr "silinen {files}" @@ -109,84 +109,84 @@ msgstr "silinen {files}" msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir." -#: js/files.js:183 +#: js/files.js:174 msgid "generating ZIP-file, it may take some time." msgstr "ZIP dosyası oluşturuluyor, biraz sürebilir." -#: js/files.js:218 +#: js/files.js:212 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi" -#: js/files.js:218 +#: js/files.js:212 msgid "Upload Error" msgstr "Yükleme hatası" -#: js/files.js:235 +#: js/files.js:229 msgid "Close" msgstr "Kapat" -#: js/files.js:254 js/files.js:368 js/files.js:398 +#: js/files.js:248 js/files.js:362 js/files.js:392 msgid "Pending" msgstr "Bekliyor" -#: js/files.js:274 +#: js/files.js:268 msgid "1 file uploading" msgstr "1 dosya yüklendi" -#: js/files.js:277 js/files.js:331 js/files.js:346 +#: js/files.js:271 js/files.js:325 js/files.js:340 msgid "{count} files uploading" -msgstr "" +msgstr "{count} dosya yükleniyor" -#: js/files.js:349 js/files.js:382 +#: js/files.js:343 js/files.js:376 msgid "Upload cancelled." msgstr "Yükleme iptal edildi." -#: js/files.js:451 +#: js/files.js:445 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur." -#: js/files.js:523 +#: js/files.js:515 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" -msgstr "" +msgstr "Geçersiz dizin ismi. \"Shared\" dizini OwnCloud tarafından kullanılmaktadır." -#: js/files.js:704 +#: js/files.js:699 msgid "{count} files scanned" -msgstr "" +msgstr "{count} dosya tarandı" -#: js/files.js:712 +#: js/files.js:707 msgid "error while scanning" msgstr "tararamada hata oluşdu" -#: js/files.js:785 templates/index.php:65 +#: js/files.js:780 templates/index.php:66 msgid "Name" msgstr "Ad" -#: js/files.js:786 templates/index.php:76 +#: js/files.js:781 templates/index.php:77 msgid "Size" msgstr "Boyut" -#: js/files.js:787 templates/index.php:78 +#: js/files.js:782 templates/index.php:79 msgid "Modified" msgstr "Değiştirilme" -#: js/files.js:814 +#: js/files.js:801 msgid "1 folder" -msgstr "" +msgstr "1 dizin" -#: js/files.js:816 +#: js/files.js:803 msgid "{count} folders" -msgstr "" +msgstr "{count} dizin" -#: js/files.js:824 +#: js/files.js:811 msgid "1 file" -msgstr "" +msgstr "1 dosya" -#: js/files.js:826 +#: js/files.js:813 msgid "{count} files" -msgstr "" +msgstr "{count} dosya" #: templates/admin.php:5 msgid "File handling" @@ -234,7 +234,7 @@ msgstr "Klasör" #: templates/index.php:14 msgid "From link" -msgstr "" +msgstr "Bağlantıdan" #: templates/index.php:35 msgid "Upload" @@ -244,28 +244,28 @@ msgstr "Yükle" msgid "Cancel upload" msgstr "Yüklemeyi iptal et" -#: templates/index.php:57 +#: templates/index.php:58 msgid "Nothing in here. Upload something!" msgstr "Burada hiçbir şey yok. Birşeyler yükleyin!" -#: templates/index.php:71 +#: templates/index.php:72 msgid "Download" msgstr "İndir" -#: templates/index.php:103 +#: templates/index.php:104 msgid "Upload too large" msgstr "Yüklemeniz çok büyük" -#: templates/index.php:105 +#: templates/index.php:106 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor." -#: templates/index.php:110 +#: templates/index.php:111 msgid "Files are being scanned, please wait." msgstr "Dosyalar taranıyor, lütfen bekleyin." -#: templates/index.php:113 +#: templates/index.php:114 msgid "Current scanning" msgstr "Güncel tarama" diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po index af47564a459..c48e3908ae6 100644 --- a/l10n/tr/files_encryption.po +++ b/l10n/tr/files_encryption.po @@ -3,32 +3,33 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Necdet Yücel , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-13 23:12+0200\n" -"PO-Revision-Date: 2012-08-12 22:33+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2012-12-28 00:20+0100\n" +"PO-Revision-Date: 2012-12-27 10:35+0000\n" +"Last-Translator: Necdet Yücel \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" "Content-Transfer-Encoding: 8bit\n" "Language: tr\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: templates/settings.php:3 msgid "Encryption" -msgstr "" +msgstr "Şifreleme" -#: templates/settings.php:4 -msgid "Exclude the following file types from encryption" -msgstr "" +#: templates/settings.php:6 +msgid "Enable Encryption" +msgstr "Şifrelemeyi Etkinleştir" -#: templates/settings.php:5 +#: templates/settings.php:7 msgid "None" -msgstr "" +msgstr "Hiçbiri" -#: templates/settings.php:10 -msgid "Enable Encryption" -msgstr "" +#: templates/settings.php:12 +msgid "Exclude the following file types from encryption" +msgstr "Aşağıdaki dosya tiplerini şifrelemeye dahil etme" diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po index b9f7d56aeb9..bb6c928a053 100644 --- a/l10n/tr/files_external.po +++ b/l10n/tr/files_external.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Necdet Yücel , 2012. 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: 2012-12-28 00:20+0100\n" +"PO-Revision-Date: 2012-12-27 13:50+0000\n" +"Last-Translator: Necdet Yücel \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" @@ -56,39 +57,39 @@ msgstr "" #: templates/settings.php:3 msgid "External Storage" -msgstr "" +msgstr "Harici Depolama" #: templates/settings.php:8 templates/settings.php:22 msgid "Mount point" -msgstr "" +msgstr "Bağlama Noktası" #: templates/settings.php:9 msgid "Backend" -msgstr "" +msgstr "Yönetici" #: templates/settings.php:10 msgid "Configuration" -msgstr "" +msgstr "Yapılandırma" #: templates/settings.php:11 msgid "Options" -msgstr "" +msgstr "Seçenekler" #: templates/settings.php:12 msgid "Applicable" -msgstr "" +msgstr "Uygulanabilir" #: templates/settings.php:27 msgid "Add mount point" -msgstr "" +msgstr "Bağlama noktası ekle" #: templates/settings.php:85 msgid "None set" -msgstr "" +msgstr "Hiçbiri" #: templates/settings.php:86 msgid "All Users" -msgstr "" +msgstr "Tüm Kullanıcılar" #: templates/settings.php:87 msgid "Groups" @@ -99,7 +100,7 @@ msgid "Users" msgstr "Kullanıcılar" #: 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 "Sil" @@ -111,10 +112,10 @@ msgstr "" msgid "Allow users to mount their own external storage" msgstr "" -#: templates/settings.php:139 +#: templates/settings.php:136 msgid "SSL root certificates" -msgstr "" +msgstr "SSL kök sertifikaları" -#: templates/settings.php:158 +#: templates/settings.php:153 msgid "Import Root Certificate" -msgstr "" +msgstr "Kök Sertifikalarını İçe Aktar" diff --git a/l10n/tr/files_versions.po b/l10n/tr/files_versions.po index d9aaae9d168..1d3dff15348 100644 --- a/l10n/tr/files_versions.po +++ b/l10n/tr/files_versions.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Necdet Yücel , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-22 01:14+0200\n" -"PO-Revision-Date: 2012-09-21 23:15+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-28 00:20+0100\n" +"PO-Revision-Date: 2012-12-27 09:24+0000\n" +"Last-Translator: Necdet Yücel \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" @@ -17,26 +18,26 @@ msgstr "" "Language: tr\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: js/settings-personal.js:31 templates/settings-personal.php:10 +#: js/settings-personal.js:31 templates/settings-personal.php:7 msgid "Expire all versions" -msgstr "" +msgstr "Tüm sürümleri sona erdir" #: js/versions.js:16 msgid "History" -msgstr "" +msgstr "Geçmiş" #: templates/settings-personal.php:4 msgid "Versions" -msgstr "" +msgstr "Sürümler" -#: templates/settings-personal.php:7 +#: templates/settings-personal.php:10 msgid "This will delete all existing backup versions of your files" -msgstr "" +msgstr "Bu dosyalarınızın tüm yedek sürümlerini silecektir" #: templates/settings.php:3 msgid "Files Versioning" -msgstr "" +msgstr "Dosya Sürümleri" #: templates/settings.php:4 msgid "Enable" -msgstr "" +msgstr "Etkinleştir" diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po index 6489d33ae28..66590bc8eb0 100644 --- a/l10n/tr/lib.po +++ b/l10n/tr/lib.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Necdet Yücel , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-16 00:02+0100\n" -"PO-Revision-Date: 2012-11-14 23:13+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-28 00:20+0100\n" +"PO-Revision-Date: 2012-12-27 11:03+0000\n" +"Last-Translator: Necdet Yücel \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" @@ -17,49 +18,49 @@ msgstr "" "Language: tr\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: app.php:285 +#: app.php:287 msgid "Help" msgstr "Yardı" -#: app.php:292 +#: app.php:294 msgid "Personal" msgstr "Kişisel" -#: app.php:297 +#: app.php:299 msgid "Settings" msgstr "Ayarlar" -#: app.php:302 +#: app.php:304 msgid "Users" msgstr "Kullanıcılar" -#: app.php:309 +#: app.php:311 msgid "Apps" -msgstr "" +msgstr "Uygulamalar" -#: app.php:311 +#: app.php:313 msgid "Admin" -msgstr "" +msgstr "Yönetici" -#: files.php:332 +#: files.php:365 msgid "ZIP download is turned off." -msgstr "" +msgstr "ZIP indirmeleri kapatılmıştır." -#: files.php:333 +#: files.php:366 msgid "Files need to be downloaded one by one." -msgstr "" +msgstr "Dosyaların birer birer indirilmesi gerekmektedir." -#: files.php:333 files.php:358 +#: files.php:366 files.php:391 msgid "Back to Files" -msgstr "" +msgstr "Dosyalara dön" -#: files.php:357 +#: files.php:390 msgid "Selected files too large to generate zip file." -msgstr "" +msgstr "Seçilen dosyalar bir zip dosyası oluşturmak için fazla büyüktür." #: json.php:28 msgid "Application is not enabled" -msgstr "" +msgstr "Uygulama etkinleştirilmedi" #: json.php:39 json.php:64 json.php:77 json.php:89 msgid "Authentication error" @@ -67,7 +68,7 @@ msgstr "Kimlik doğrulama hatası" #: json.php:51 msgid "Token expired. Please reload page." -msgstr "" +msgstr "Jetonun süresi geçti. Lütfen sayfayı yenileyin." #: search/provider/file.php:17 search/provider/file.php:35 msgid "Files" @@ -79,74 +80,74 @@ msgstr "Metin" #: search/provider/file.php:29 msgid "Images" -msgstr "" +msgstr "Resimler" #: template.php:103 msgid "seconds ago" -msgstr "" +msgstr "saniye önce" #: template.php:104 msgid "1 minute ago" -msgstr "" +msgstr "1 dakika önce" #: template.php:105 #, php-format msgid "%d minutes ago" -msgstr "" +msgstr "%d dakika önce" #: template.php:106 msgid "1 hour ago" -msgstr "" +msgstr "1 saat önce" #: template.php:107 #, php-format msgid "%d hours ago" -msgstr "" +msgstr "%d saat önce" #: template.php:108 msgid "today" -msgstr "" +msgstr "bugün" #: template.php:109 msgid "yesterday" -msgstr "" +msgstr "dün" #: template.php:110 #, php-format msgid "%d days ago" -msgstr "" +msgstr "%d gün önce" #: template.php:111 msgid "last month" -msgstr "" +msgstr "geçen ay" #: template.php:112 #, php-format msgid "%d months ago" -msgstr "" +msgstr "%d ay önce" #: template.php:113 msgid "last year" -msgstr "" +msgstr "geçen yıl" #: template.php:114 msgid "years ago" -msgstr "" +msgstr "yıl önce" #: updater.php:75 #, php-format msgid "%s is available. Get more information" -msgstr "" +msgstr "%s kullanılabilir durumda. Daha fazla bilgi alın" #: updater.php:77 msgid "up to date" -msgstr "" +msgstr "güncel" #: updater.php:80 msgid "updates check is disabled" -msgstr "" +msgstr "güncelleme kontrolü kapalı" #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" -msgstr "" +msgstr "\"%s\" kategorisi bulunamadı" diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po index 499cd990dac..424615dce38 100644 --- a/l10n/tr/settings.po +++ b/l10n/tr/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-28 00:20+0100\n" +"PO-Revision-Date: 2012-12-27 11:45+0000\n" +"Last-Translator: Necdet Yücel \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" @@ -121,27 +121,27 @@ msgstr "" #: templates/help.php:3 msgid "User Documentation" -msgstr "" +msgstr "Kullanıcı Belgelendirmesi" #: templates/help.php:4 msgid "Administrator Documentation" -msgstr "" +msgstr "Yönetici Belgelendirmesi" #: templates/help.php:6 msgid "Online Documentation" -msgstr "" +msgstr "Çevrimiçi Belgelendirme" #: templates/help.php:7 msgid "Forum" -msgstr "" +msgstr "Forum" #: templates/help.php:9 msgid "Bugtracker" -msgstr "" +msgstr "Hata Takip Sistemi" #: templates/help.php:11 msgid "Commercial Support" -msgstr "" +msgstr "Ticari Destek" #: templates/personal.php:8 #, php-format @@ -154,15 +154,15 @@ msgstr "Müşteriler" #: templates/personal.php:13 msgid "Download Desktop Clients" -msgstr "" +msgstr "Masaüstü İstemcilerini İndir" #: templates/personal.php:14 msgid "Download Android Client" -msgstr "" +msgstr "Android İstemcisini İndir" #: templates/personal.php:15 msgid "Download iOS Client" -msgstr "" +msgstr "iOS İstemcisini İndir" #: templates/personal.php:21 templates/users.php:23 templates/users.php:77 msgid "Password" @@ -214,7 +214,7 @@ msgstr "Çevirilere yardım edin" #: templates/personal.php:52 msgid "WebDAV" -msgstr "" +msgstr "WebDAV" #: templates/personal.php:54 msgid "Use this address to connect to your ownCloud in your file manager" @@ -222,7 +222,7 @@ msgstr "" #: templates/personal.php:63 msgid "Version" -msgstr "" +msgstr "Sürüm" #: templates/personal.php:65 msgid "" diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po index da2eff7ebaa..f71a0608229 100644 --- a/l10n/tr/user_ldap.po +++ b/l10n/tr/user_ldap.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Necdet Yücel , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-28 00:20+0100\n" +"PO-Revision-Date: 2012-12-27 12:54+0000\n" +"Last-Translator: Necdet Yücel \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" @@ -32,7 +33,7 @@ msgstr "" #: templates/settings.php:15 msgid "Host" -msgstr "" +msgstr "Konak" #: templates/settings.php:15 msgid "" @@ -41,7 +42,7 @@ msgstr "" #: templates/settings.php:16 msgid "Base DN" -msgstr "" +msgstr "Base DN" #: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" @@ -49,7 +50,7 @@ msgstr "" #: templates/settings.php:17 msgid "User DN" -msgstr "" +msgstr "User DN" #: templates/settings.php:17 msgid "" @@ -60,7 +61,7 @@ msgstr "" #: templates/settings.php:18 msgid "Password" -msgstr "" +msgstr "Parola" #: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." @@ -68,7 +69,7 @@ msgstr "" #: templates/settings.php:19 msgid "User Login Filter" -msgstr "" +msgstr "Kullanıcı Oturum Açma Süzgeci" #: templates/settings.php:19 #, php-format @@ -84,7 +85,7 @@ msgstr "" #: templates/settings.php:20 msgid "User List Filter" -msgstr "" +msgstr "Kullanıcı Liste Süzgeci" #: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." @@ -96,7 +97,7 @@ msgstr "" #: templates/settings.php:21 msgid "Group Filter" -msgstr "" +msgstr "Grup Süzgeci" #: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." @@ -108,7 +109,7 @@ msgstr "" #: templates/settings.php:24 msgid "Port" -msgstr "" +msgstr "Port" #: templates/settings.php:25 msgid "Base User Tree" @@ -124,7 +125,7 @@ msgstr "" #: templates/settings.php:28 msgid "Use TLS" -msgstr "" +msgstr "TLS kullan" #: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." @@ -180,4 +181,4 @@ msgstr "" #: templates/settings.php:39 msgid "Help" -msgstr "" +msgstr "Yardım" diff --git a/l10n/tr/user_webdavauth.po b/l10n/tr/user_webdavauth.po index 1e5828d9ba9..ca1186efbec 100644 --- a/l10n/tr/user_webdavauth.po +++ b/l10n/tr/user_webdavauth.po @@ -4,13 +4,14 @@ # # Translators: # , 2012. +# Necdet Yücel , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:12+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-28 00:20+0100\n" +"PO-Revision-Date: 2012-12-27 09:06+0000\n" +"Last-Translator: Necdet Yücel \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" @@ -20,7 +21,7 @@ msgstr "" #: templates/settings.php:4 msgid "URL: http://" -msgstr "" +msgstr "URL: http://" #: templates/settings.php:6 msgid "" diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php index 69067d7ec57..9b7f1815fa3 100644 --- a/lib/l10n/tr.php +++ b/lib/l10n/tr.php @@ -3,7 +3,32 @@ "Personal" => "Kişisel", "Settings" => "Ayarlar", "Users" => "Kullanıcılar", +"Apps" => "Uygulamalar", +"Admin" => "Yönetici", +"ZIP download is turned off." => "ZIP indirmeleri kapatılmıştır.", +"Files need to be downloaded one by one." => "Dosyaların birer birer indirilmesi gerekmektedir.", +"Back to Files" => "Dosyalara dön", +"Selected files too large to generate zip file." => "Seçilen dosyalar bir zip dosyası oluşturmak için fazla büyüktür.", +"Application is not enabled" => "Uygulama etkinleştirilmedi", "Authentication error" => "Kimlik doğrulama hatası", +"Token expired. Please reload page." => "Jetonun süresi geçti. Lütfen sayfayı yenileyin.", "Files" => "Dosyalar", -"Text" => "Metin" +"Text" => "Metin", +"Images" => "Resimler", +"seconds ago" => "saniye önce", +"1 minute ago" => "1 dakika önce", +"%d minutes ago" => "%d dakika önce", +"1 hour ago" => "1 saat önce", +"%d hours ago" => "%d saat önce", +"today" => "bugün", +"yesterday" => "dün", +"%d days ago" => "%d gün önce", +"last month" => "geçen ay", +"%d months ago" => "%d ay önce", +"last year" => "geçen yıl", +"years ago" => "yıl önce", +"%s is available. Get more information" => "%s kullanılabilir durumda. Daha fazla bilgi alın", +"up to date" => "güncel", +"updates check is disabled" => "güncelleme kontrolü kapalı", +"Could not find category \"%s\"" => "\"%s\" kategorisi bulunamadı" ); diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php index 463e9c19af9..ee85f723f69 100644 --- a/settings/l10n/eu.php +++ b/settings/l10n/eu.php @@ -23,8 +23,17 @@ "Select an App" => "Aukeratu programa bat", "See application page at apps.owncloud.com" => "Ikusi programen orria apps.owncloud.com en", "-licensed by " => "-lizentziatua ", +"User Documentation" => "Erabiltzaile dokumentazioa", +"Administrator Documentation" => "Administradore dokumentazioa", +"Online Documentation" => "Online dokumentazioa", +"Forum" => "Foroa", +"Bugtracker" => "Bugtracker", +"Commercial Support" => "Babes komertziala", "You have used %s of the available %s" => "Dagoeneko %s erabili duzu eskuragarri duzun %setatik", "Clients" => "Bezeroak", +"Download Desktop Clients" => "Deskargatu mahaigainerako bezeroak", +"Download Android Client" => "Deskargatu Android bezeroa", +"Download iOS Client" => "Deskargatu iOS bezeroa", "Password" => "Pasahitza", "Your password was changed" => "Zere pasahitza aldatu da", "Unable to change your password" => "Ezin izan da zure pasahitza aldatu", @@ -37,6 +46,9 @@ "Fill in an email address to enable password recovery" => "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko", "Language" => "Hizkuntza", "Help translate" => "Lagundu itzultzen", +"WebDAV" => "WebDAV", +"Use this address to connect to your ownCloud in your file manager" => "Erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko", +"Version" => "Bertsioa", "Developed by the ownCloud community, the source code is licensed under the AGPL." => "ownCloud komunitateak garatuta, itubruru kodeaAGPL lizentziarekin banatzen da.", "Name" => "Izena", "Groups" => "Taldeak", diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php index f8acb9b28f2..44dee92a3fc 100644 --- a/settings/l10n/tr.php +++ b/settings/l10n/tr.php @@ -20,7 +20,16 @@ "More Apps" => "Daha fazla App", "Select an App" => "Bir uygulama seçin", "See application page at apps.owncloud.com" => "Uygulamanın sayfasına apps.owncloud.com adresinden bakın ", +"User Documentation" => "Kullanıcı Belgelendirmesi", +"Administrator Documentation" => "Yönetici Belgelendirmesi", +"Online Documentation" => "Çevrimiçi Belgelendirme", +"Forum" => "Forum", +"Bugtracker" => "Hata Takip Sistemi", +"Commercial Support" => "Ticari Destek", "Clients" => "Müşteriler", +"Download Desktop Clients" => "Masaüstü İstemcilerini İndir", +"Download Android Client" => "Android İstemcisini İndir", +"Download iOS Client" => "iOS İstemcisini İndir", "Password" => "Parola", "Your password was changed" => "Şifreniz değiştirildi", "Unable to change your password" => "Parolanız değiştirilemiyor", @@ -33,6 +42,8 @@ "Fill in an email address to enable password recovery" => "Parola sıfırlamayı aktifleştirmek için eposta adresi girin", "Language" => "Dil", "Help translate" => "Çevirilere yardım edin", +"WebDAV" => "WebDAV", +"Version" => "Sürüm", "Developed by the ownCloud community, the source code is licensed under the AGPL." => "Geliştirilen TarafownCloud community, the source code is altında lisanslanmıştır AGPL.", "Name" => "Ad", "Groups" => "Gruplar", -- cgit v1.2.3 From 7980bccaabcaa27fe9c6db8a49a6e4a8dc4bd3fe Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sun, 16 Dec 2012 19:43:32 -0500 Subject: Fall back to default log file if logfile config file not found, suppress writing errors, fixes issue #826 --- lib/log/owncloud.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php index ec43208d833..e53dd5fefcd 100644 --- a/lib/log/owncloud.php +++ b/lib/log/owncloud.php @@ -33,8 +33,11 @@ class OC_Log_Owncloud { * Init class data */ public static function init() { - $datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' ); - self::$logFile=OC_Config::getValue( "logfile", $datadir.'/owncloud.log' ); + $defaultLogFile = OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data').'/owncloud.log'; + self::$logFile = OC_Config::getValue("logfile", $defaultLogFile); + if (!file_exists(self::$logFile)) { + self::$logFile = $defaultLogFile; + } } /** @@ -47,9 +50,11 @@ class OC_Log_Owncloud { $minLevel=min(OC_Config::getValue( "loglevel", OC_Log::WARN ), OC_Log::ERROR); if($level>=$minLevel) { $entry=array('app'=>$app, 'message'=>$message, 'level'=>$level, 'time'=>time()); - $fh=fopen(self::$logFile, 'a'); - fwrite($fh, json_encode($entry)."\n"); - fclose($fh); + $handle = @fopen(self::$logFile, 'a'); + if ($handle) { + fwrite($handle, json_encode($entry)."\n"); + fclose($handle); + } } } -- cgit v1.2.3 From 66e57f5fb1ed509761dededfecdf2ebc63738453 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sun, 30 Dec 2012 00:05:52 +0100 Subject: [tx-robot] updated from transifex --- apps/files/l10n/nb_NO.php | 3 ++ apps/files_sharing/l10n/hu_HU.php | 5 +- apps/user_ldap/l10n/hu_HU.php | 37 +++++++++++++ apps/user_webdavauth/l10n/es.php | 3 +- apps/user_webdavauth/l10n/es_AR.php | 3 +- apps/user_webdavauth/l10n/fr.php | 2 +- apps/user_webdavauth/l10n/nb_NO.php | 3 ++ core/l10n/nb_NO.php | 6 +++ l10n/ar/settings.po | 36 ++++++++----- l10n/bg_BG/settings.po | 34 +++++++----- l10n/ca/settings.po | 36 ++++++++----- l10n/cs_CZ/settings.po | 36 ++++++++----- l10n/da/settings.po | 36 ++++++++----- l10n/de/settings.po | 36 ++++++++----- l10n/de_DE/settings.po | 36 ++++++++----- l10n/el/settings.po | 36 ++++++++----- l10n/eo/settings.po | 34 +++++++----- l10n/es/settings.po | 59 +++++++++++--------- l10n/es/user_webdavauth.po | 11 ++-- l10n/es_AR/settings.po | 58 +++++++++++--------- l10n/es_AR/user_webdavauth.po | 11 ++-- l10n/et_EE/settings.po | 34 +++++++----- l10n/eu/settings.po | 36 ++++++++----- l10n/fa/settings.po | 34 +++++++----- l10n/fi_FI/settings.po | 36 ++++++++----- l10n/fr/settings.po | 36 ++++++++----- l10n/fr/user_webdavauth.po | 9 ++-- l10n/gl/settings.po | 34 +++++++----- l10n/he/settings.po | 36 ++++++++----- l10n/hi/settings.po | 30 +++++++---- l10n/hr/settings.po | 34 +++++++----- l10n/hu_HU/files_sharing.po | 18 +++---- l10n/hu_HU/settings.po | 104 +++++++++++++++++++----------------- l10n/hu_HU/user_ldap.po | 76 +++++++++++++------------- l10n/ia/settings.po | 34 +++++++----- l10n/id/settings.po | 34 +++++++----- l10n/is/settings.po | 30 +++++++---- l10n/it/settings.po | 36 ++++++++----- l10n/ja_JP/settings.po | 36 ++++++++----- l10n/ka_GE/settings.po | 34 +++++++----- l10n/ko/settings.po | 34 +++++++----- l10n/ku_IQ/settings.po | 30 +++++++---- l10n/lb/settings.po | 34 +++++++----- l10n/lt_LT/settings.po | 34 +++++++----- l10n/lv/settings.po | 34 +++++++----- l10n/mk/settings.po | 36 ++++++++----- l10n/ms_MY/settings.po | 34 +++++++----- l10n/nb_NO/core.po | 77 +++++++++++++------------- l10n/nb_NO/files.po | 85 ++++++++++++++--------------- l10n/nb_NO/lib.po | 37 ++++++------- l10n/nb_NO/settings.po | 53 ++++++++++-------- l10n/nb_NO/user_webdavauth.po | 9 ++-- l10n/nl/settings.po | 36 ++++++++----- l10n/nn_NO/settings.po | 32 ++++++----- l10n/oc/settings.po | 34 +++++++----- l10n/pl/settings.po | 34 +++++++----- l10n/pl_PL/settings.po | 30 +++++++---- l10n/pt_BR/settings.po | 34 +++++++----- l10n/pt_PT/settings.po | 36 ++++++++----- l10n/ro/settings.po | 34 +++++++----- l10n/ru/settings.po | 36 ++++++++----- l10n/ru_RU/settings.po | 36 ++++++++----- l10n/si_LK/settings.po | 34 +++++++----- l10n/sk_SK/settings.po | 34 +++++++----- l10n/sl/settings.po | 34 +++++++----- l10n/sq/settings.po | 30 +++++++---- l10n/sr/settings.po | 34 +++++++----- l10n/sr@latin/settings.po | 30 +++++++---- l10n/sv/settings.po | 36 ++++++++----- l10n/ta_LK/settings.po | 34 +++++++----- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 28 ++++++---- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- l10n/th_TH/settings.po | 34 +++++++----- l10n/tr/settings.po | 36 ++++++++----- l10n/uk/settings.po | 36 ++++++++----- l10n/vi/settings.po | 34 +++++++----- l10n/zh_CN.GB2312/settings.po | 34 +++++++----- l10n/zh_CN/settings.po | 36 ++++++++----- l10n/zh_HK/settings.po | 30 +++++++---- l10n/zh_TW/settings.po | 34 +++++++----- l10n/zu_ZA/settings.po | 30 +++++++---- lib/l10n/nb_NO.php | 8 ++- settings/l10n/ar.php | 2 - settings/l10n/bg_BG.php | 2 - settings/l10n/ca.php | 2 - settings/l10n/cs_CZ.php | 2 - settings/l10n/da.php | 2 - settings/l10n/de.php | 2 - settings/l10n/de_DE.php | 2 - settings/l10n/el.php | 2 - settings/l10n/eo.php | 2 - settings/l10n/es.php | 14 ++++- settings/l10n/es_AR.php | 14 ++++- settings/l10n/et_EE.php | 2 - settings/l10n/eu.php | 2 - settings/l10n/fa.php | 2 - settings/l10n/fi_FI.php | 2 - settings/l10n/fr.php | 2 - settings/l10n/gl.php | 2 - settings/l10n/he.php | 2 - settings/l10n/hr.php | 2 - settings/l10n/hu_HU.php | 50 ++++++++++++----- settings/l10n/ia.php | 2 - settings/l10n/id.php | 2 - settings/l10n/it.php | 2 - settings/l10n/ja_JP.php | 2 - settings/l10n/ka_GE.php | 2 - settings/l10n/ko.php | 2 - settings/l10n/lb.php | 2 - settings/l10n/lt_LT.php | 2 - settings/l10n/lv.php | 2 - settings/l10n/mk.php | 2 - settings/l10n/ms_MY.php | 2 - settings/l10n/nb_NO.php | 11 +++- settings/l10n/nl.php | 2 - settings/l10n/nn_NO.php | 1 - settings/l10n/oc.php | 2 - settings/l10n/pl.php | 2 - settings/l10n/pt_BR.php | 2 - settings/l10n/pt_PT.php | 2 - settings/l10n/ro.php | 2 - settings/l10n/ru.php | 2 - settings/l10n/ru_RU.php | 2 - settings/l10n/si_LK.php | 2 - settings/l10n/sk_SK.php | 2 - settings/l10n/sl.php | 2 - settings/l10n/sr.php | 2 - settings/l10n/sv.php | 2 - settings/l10n/ta_LK.php | 2 - settings/l10n/th_TH.php | 2 - settings/l10n/tr.php | 2 - settings/l10n/uk.php | 2 - settings/l10n/vi.php | 2 - settings/l10n/zh_CN.GB2312.php | 2 - settings/l10n/zh_CN.php | 2 - settings/l10n/zh_TW.php | 2 - 144 files changed, 1704 insertions(+), 1189 deletions(-) create mode 100644 apps/user_ldap/l10n/hu_HU.php create mode 100644 apps/user_webdavauth/l10n/nb_NO.php (limited to 'lib') diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php index e5615a1c29b..db54660ab1e 100644 --- a/apps/files/l10n/nb_NO.php +++ b/apps/files/l10n/nb_NO.php @@ -17,6 +17,7 @@ "undo" => "angre", "replaced {new_name} with {old_name}" => "erstatt {new_name} med {old_name}", "deleted {files}" => "slettet {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.", "generating ZIP-file, it may take some time." => "opprettet ZIP-fil, dette kan ta litt tid", "Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes", "Upload Error" => "Opplasting feilet", @@ -26,6 +27,7 @@ "{count} files uploading" => "{count} filer laster opp", "Upload cancelled." => "Opplasting avbrutt.", "File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.", "{count} files scanned" => "{count} filer lest inn", "error while scanning" => "feil under skanning", "Name" => "Navn", @@ -46,6 +48,7 @@ "New" => "Ny", "Text file" => "Tekstfil", "Folder" => "Mappe", +"From link" => "Fra link", "Upload" => "Last opp", "Cancel upload" => "Avbryt opplasting", "Nothing in here. Upload something!" => "Ingenting her. Last opp noe!", diff --git a/apps/files_sharing/l10n/hu_HU.php b/apps/files_sharing/l10n/hu_HU.php index 881b5afd817..be706461d58 100644 --- a/apps/files_sharing/l10n/hu_HU.php +++ b/apps/files_sharing/l10n/hu_HU.php @@ -1,6 +1,3 @@ "Méret", -"Modified" => "Módosítva", -"Delete all" => "Összes törlése", -"Delete" => "Törlés" +"Password" => "Jelszó" ); diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php new file mode 100644 index 00000000000..14eb5837ceb --- /dev/null +++ b/apps/user_ldap/l10n/hu_HU.php @@ -0,0 +1,37 @@ +Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Figyelem: a user_ldap és user_webdavauth alkalmazások nem kompatibilisek. Együttes használatuk váratlan eredményekhez vezethet. Kérje meg a rendszergazdát, hogy a kettő közül kapcsolja ki az egyiket.", +"Warning: The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "Figyelem: a szükséges PHP LDAP modul nincs telepítve. Enélkül az LDAP azonosítás nem fog működni. Kérje meg a rendszergazdát, hogy telepítse a szükséges modult!", +"Host" => "Kiszolgáló", +"You can omit the protocol, except you require SSL. Then start with ldaps://" => "A protokoll előtag elhagyható, kivéve, ha SSL-t kíván használni. Ebben az esetben kezdje így: ldaps://", +"Base DN" => "DN-gyökér", +"You can specify Base DN for users and groups in the Advanced tab" => "A Haladó fülre kattintva külön DN-gyökér állítható be a felhasználók és a csoportok számára", +"User DN" => "A kapcsolódó felhasználó DN-je", +"Password" => "Jelszó", +"For anonymous access, leave DN and Password empty." => "Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!", +"User Login Filter" => "Szűrő a bejelentkezéshez", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Ez a szűrő érvényes a bejelentkezés megkísérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül.", +"use %%uid placeholder, e.g. \"uid=%%uid\"" => "használja az %%uid változót, pl. \"uid=%%uid\"", +"User List Filter" => "A felhasználók szűrője", +"Defines the filter to apply, when retrieving users." => "Ez a szűrő érvényes a felhasználók listázásakor.", +"without any placeholder, e.g. \"objectClass=person\"." => "itt ne használjon változót, pl. \"objectClass=person\".", +"Group Filter" => "A csoportok szűrője", +"Defines the filter to apply, when retrieving groups." => "Ez a szűrő érvényes a csoportok listázásakor.", +"without any placeholder, e.g. \"objectClass=posixGroup\"." => "itt ne használjunk változót, pl. \"objectClass=posixGroup\".", +"Base User Tree" => "A felhasználói fa gyökere", +"Base Group Tree" => "A csoportfa gyökere", +"Group-Member association" => "A csoporttagság attribútuma", +"Use TLS" => "Használjunk TLS-t", +"Do not use it for SSL connections, it will fail." => "Ne használjuk SSL-kapcsolat esetén, mert nem fog működni!", +"Case insensitve LDAP server (Windows)" => "Az LDAP-kiszolgáló nem tesz különbséget a kis- és nagybetűk között (Windows)", +"Turn off SSL certificate validation." => "Ne ellenőrizzük az SSL-tanúsítvány érvényességét", +"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Ha a kapcsolat csak ezzel a beállítással működik, akkor importálja az LDAP-kiszolgáló SSL tanúsítványát az ownCloud kiszolgálóra!", +"Not recommended, use for testing only." => "Nem javasolt, csak tesztelésre érdemes használni.", +"User Display Name Field" => "A felhasználónév mezője", +"The LDAP attribute to use to generate the user`s ownCloud name." => "Ebből az LDAP attribútumból képződik a felhasználó elnevezése, ami megjelenik az ownCloudban.", +"Group Display Name Field" => "A csoport nevének mezője", +"The LDAP attribute to use to generate the groups`s ownCloud name." => "Ebből az LDAP attribútumból képződik a csoport elnevezése, ami megjelenik az ownCloudban.", +"in bytes" => "bájtban", +"in seconds. A change empties the cache." => "másodpercben. A változtatás törli a cache tartalmát.", +"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Hagyja üresen, ha a felhasználónevet kívánja használni. Ellenkező esetben adjon meg egy LDAP/AD attribútumot!", +"Help" => "Súgó" +); diff --git a/apps/user_webdavauth/l10n/es.php b/apps/user_webdavauth/l10n/es.php index 9bd32954b05..3975b04cbc1 100644 --- a/apps/user_webdavauth/l10n/es.php +++ b/apps/user_webdavauth/l10n/es.php @@ -1,3 +1,4 @@ "WebDAV URL: http://" +"URL: http://" => "URL: http://", +"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud enviará al usuario las interpretaciones 401 y 403 a esta URL como incorrectas y todas las otras credenciales como correctas" ); diff --git a/apps/user_webdavauth/l10n/es_AR.php b/apps/user_webdavauth/l10n/es_AR.php index 81f2ea1e578..0606d3a8eb4 100644 --- a/apps/user_webdavauth/l10n/es_AR.php +++ b/apps/user_webdavauth/l10n/es_AR.php @@ -1,3 +1,4 @@ "URL de WebDAV: http://" +"URL: http://" => "URL: http://", +"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud enviará las credenciales a esta dirección, si son interpretadas como http 401 o http 403 las credenciales son erroneas; todos los otros códigos indican que las credenciales son correctas." ); diff --git a/apps/user_webdavauth/l10n/fr.php b/apps/user_webdavauth/l10n/fr.php index 759d45b230e..339931c7cee 100644 --- a/apps/user_webdavauth/l10n/fr.php +++ b/apps/user_webdavauth/l10n/fr.php @@ -1,3 +1,3 @@ "URL WebDAV : http://" +"URL: http://" => "URL : http://" ); diff --git a/apps/user_webdavauth/l10n/nb_NO.php b/apps/user_webdavauth/l10n/nb_NO.php new file mode 100644 index 00000000000..245a5101341 --- /dev/null +++ b/apps/user_webdavauth/l10n/nb_NO.php @@ -0,0 +1,3 @@ + "URL: http://" +); diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php index 7382a1e8398..4069e297a7b 100644 --- a/core/l10n/nb_NO.php +++ b/core/l10n/nb_NO.php @@ -6,10 +6,13 @@ "seconds ago" => "sekunder siden", "1 minute ago" => "1 minutt siden", "{minutes} minutes ago" => "{minutes} minutter siden", +"1 hour ago" => "1 time siden", +"{hours} hours ago" => "{hours} timer siden", "today" => "i dag", "yesterday" => "i går", "{days} days ago" => "{days} dager siden", "last month" => "forrige måned", +"{months} months ago" => "{months} måneder siden", "months ago" => "måneder siden", "last year" => "forrige år", "years ago" => "år siden", @@ -24,6 +27,7 @@ "Share with link" => "Del med link", "Password protect" => "Passordbeskyttet", "Password" => "Passord", +"Send" => "Send", "Set expiration date" => "Set utløpsdato", "Expiration date" => "Utløpsdato", "Share via email:" => "Del på epost", @@ -37,6 +41,8 @@ "share" => "del", "Password protected" => "Passordbeskyttet", "Error setting expiration date" => "Kan ikke sette utløpsdato", +"Sending ..." => "Sender...", +"Email sent" => "E-post sendt", "ownCloud password reset" => "Tilbakestill ownCloud passord", "Use the following link to reset your password: {link}" => "Bruk følgende lenke for å tilbakestille passordet ditt: {link}", "You will receive a link to reset your password via Email." => "Du burde motta detaljer om å tilbakestille passordet ditt via epost.", diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po index e3ac2066d0d..a800f4eef21 100644 --- a/l10n/ar/settings.po +++ b/l10n/ar/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-24 00:11+0100\n" -"PO-Revision-Date: 2012-12-23 18:36+0000\n" -"Last-Translator: aboodilankaboot \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -163,7 +163,7 @@ msgstr "تحميل عميل آندرويد" msgid "Download iOS Client" msgstr "تحميل عميل آي أو أس" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "كلمات السر" @@ -233,11 +233,11 @@ msgid "" "License\">AGPL." msgstr "طوّر من قبل ownCloud مجتمع, الـ النص المصدري مرخص بموجب رخصة أفيرو العمومية." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "الاسم" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "مجموعات" @@ -246,21 +246,29 @@ msgid "Create" msgstr "انشئ" #: templates/users.php:35 -msgid "Default Quota" -msgstr "الحصة النسبية الإفتراضية" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "شيء آخر" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "مدير المجموعة" -#: templates/users.php:82 -msgid "Quota" -msgstr "حصه" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "حذف" diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po index 8350e56bea4..37e75b3725c 100644 --- a/l10n/bg_BG/settings.po +++ b/l10n/bg_BG/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -163,7 +163,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Парола" @@ -233,11 +233,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Име" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Групи" @@ -246,21 +246,29 @@ msgid "Create" msgstr "Ново" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Квота по подразбиране" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Друго" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "" -#: templates/users.php:82 -msgid "Quota" -msgstr "Квота" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Изтриване" diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po index da4cfbd6279..03cdc399cfb 100644 --- a/l10n/ca/settings.po +++ b/l10n/ca/settings.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-22 00:24+0100\n" -"PO-Revision-Date: 2012-12-21 09:18+0000\n" -"Last-Translator: rogerc \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -165,7 +165,7 @@ msgstr " Baixa el client per Android" msgid "Download iOS Client" msgstr "Baixa el client per iOS" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Contrasenya" @@ -235,11 +235,11 @@ msgid "" "License\">AGPL." msgstr "Desenvolupat per la comunitat ownCloud, el codi font té llicència AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Nom" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Grups" @@ -248,21 +248,29 @@ msgid "Create" msgstr "Crea" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Quota per defecte" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Altre" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Grup Admin" -#: templates/users.php:82 -msgid "Quota" -msgstr "Quota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Suprimeix" diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po index 153ae93c6e1..d822114feb6 100644 --- a/l10n/cs_CZ/settings.po +++ b/l10n/cs_CZ/settings.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-20 19:53+0000\n" -"Last-Translator: Tomáš Chvátal \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -166,7 +166,7 @@ msgstr "Stáhnout klienta pro android" msgid "Download iOS Client" msgstr "Stáhnout klienta pro iOS" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Heslo" @@ -236,11 +236,11 @@ msgid "" "License\">AGPL." msgstr "Vyvinuto komunitou ownCloud, zdrojový kód je licencován pod AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Jméno" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Skupiny" @@ -249,21 +249,29 @@ msgid "Create" msgstr "Vytvořit" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Výchozí kvóta" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Jiná" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Správa skupiny" -#: templates/users.php:82 -msgid "Quota" -msgstr "Kvóta" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Smazat" diff --git a/l10n/da/settings.po b/l10n/da/settings.po index 95a859329a8..a4196d62a07 100644 --- a/l10n/da/settings.po +++ b/l10n/da/settings.po @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-26 00:11+0100\n" -"PO-Revision-Date: 2012-12-25 13:45+0000\n" -"Last-Translator: cronner \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -170,7 +170,7 @@ msgstr "Hent Android Klient" msgid "Download iOS Client" msgstr "Hent iOS Klient" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Kodeord" @@ -240,11 +240,11 @@ msgid "" "License\">AGPL." msgstr "Udviklet af ownClouds community, og kildekoden er underlagt licensen AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Navn" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Grupper" @@ -253,21 +253,29 @@ msgid "Create" msgstr "Ny" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Standard kvote" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Andet" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Gruppe Administrator" -#: templates/users.php:82 -msgid "Quota" -msgstr "Kvote" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Slet" diff --git a/l10n/de/settings.po b/l10n/de/settings.po index 019a9c65ce0..1343f1761fe 100644 --- a/l10n/de/settings.po +++ b/l10n/de/settings.po @@ -24,9 +24,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-23 00:09+0100\n" -"PO-Revision-Date: 2012-12-22 14:02+0000\n" -"Last-Translator: Mirodin \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+0000\n" +"Last-Translator: I Robot \n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -177,7 +177,7 @@ msgstr "Android-Client herunterladen" msgid "Download iOS Client" msgstr "iOS-Client herunterladen" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Passwort" @@ -247,11 +247,11 @@ msgid "" "License\">AGPL." msgstr "Entwickelt von der ownCloud-Community, der Quellcode ist unter der AGPL lizenziert." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Name" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Gruppen" @@ -260,21 +260,29 @@ msgid "Create" msgstr "Anlegen" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Standard-Quota" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Andere" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Gruppenadministrator" -#: templates/users.php:82 -msgid "Quota" -msgstr "Quota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Löschen" diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index d95b7bb40db..8e49c577c50 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -24,9 +24,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-23 00:09+0100\n" -"PO-Revision-Date: 2012-12-22 14:01+0000\n" -"Last-Translator: Mirodin \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+0000\n" +"Last-Translator: I Robot \n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -177,7 +177,7 @@ msgstr "Android-Client herunterladen" msgid "Download iOS Client" msgstr "iOS-Client herunterladen" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Passwort" @@ -247,11 +247,11 @@ msgid "" "License\">AGPL." msgstr "Entwickelt von der ownCloud-Community. Der Quellcode ist unter der AGPL lizenziert." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Name" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Gruppen" @@ -260,21 +260,29 @@ msgid "Create" msgstr "Anlegen" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Standard-Quota" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Andere" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Gruppenadministrator" -#: templates/users.php:82 -msgid "Quota" -msgstr "Quota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Löschen" diff --git a/l10n/el/settings.po b/l10n/el/settings.po index 4b27d019760..83f4985217b 100644 --- a/l10n/el/settings.po +++ b/l10n/el/settings.po @@ -18,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-22 00:24+0100\n" -"PO-Revision-Date: 2012-12-21 13:06+0000\n" -"Last-Translator: Efstathios Iosifidis \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -171,7 +171,7 @@ msgstr "Λήψη Προγράμματος Android" msgid "Download iOS Client" msgstr "Λήψη Προγράμματος iOS" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Συνθηματικό" @@ -241,11 +241,11 @@ msgid "" "License\">AGPL." msgstr "Αναπτύχθηκε από την κοινότητα ownCloud, ο πηγαίος κώδικας είναι υπό άδεια χρήσης AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Όνομα" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Ομάδες" @@ -254,21 +254,29 @@ msgid "Create" msgstr "Δημιουργία" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Προεπιλεγμένο Όριο" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Άλλα" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Ομάδα Διαχειριστών" -#: templates/users.php:82 -msgid "Quota" -msgstr "Σύνολο Χώρου" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Διαγραφή" diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po index 3a49fa3de2d..d57fded0283 100644 --- a/l10n/eo/settings.po +++ b/l10n/eo/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -162,7 +162,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Pasvorto" @@ -232,11 +232,11 @@ msgid "" "License\">AGPL." msgstr "Ellaborita de la komunumo de ownCloud, la fontokodo publikas laŭ la permesilo AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Nomo" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Grupoj" @@ -245,21 +245,29 @@ msgid "Create" msgstr "Krei" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Defaŭlta kvoto" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Alia" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Grupadministranto" -#: templates/users.php:82 -msgid "Quota" -msgstr "Kvoto" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Forigi" diff --git a/l10n/es/settings.po b/l10n/es/settings.po index edd67031275..e6ce79afba7 100644 --- a/l10n/es/settings.po +++ b/l10n/es/settings.po @@ -9,6 +9,7 @@ # , 2011-2012. # , 2011. # oSiNaReF <>, 2012. +# , 2012. # Raul Fernandez Garcia , 2012. # , 2012. # , 2011. @@ -18,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -128,27 +129,27 @@ msgstr "-licenciado por AGPL." msgstr "Desarrollado por la comunidad ownCloud, el código fuente está bajo licencia AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Nombre" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Grupos" @@ -254,21 +255,29 @@ msgid "Create" msgstr "Crear" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Cuota predeterminada" +msgid "Default Storage" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Otro" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Grupo admin" -#: templates/users.php:82 -msgid "Quota" -msgstr "Cuota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Eliminar" diff --git a/l10n/es/user_webdavauth.po b/l10n/es/user_webdavauth.po index e6ff0da90b0..8eec33bde17 100644 --- a/l10n/es/user_webdavauth.po +++ b/l10n/es/user_webdavauth.po @@ -4,13 +4,14 @@ # # Translators: # Art O. Pal , 2012. +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:12+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 19:17+0000\n" +"Last-Translator: pggx999 \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" @@ -20,11 +21,11 @@ msgstr "" #: templates/settings.php:4 msgid "URL: http://" -msgstr "" +msgstr "URL: http://" #: templates/settings.php:6 msgid "" "ownCloud will send the user credentials to this URL is interpret http 401 " "and http 403 as credentials wrong and all other codes as credentials " "correct." -msgstr "" +msgstr "ownCloud enviará al usuario las interpretaciones 401 y 403 a esta URL como incorrectas y todas las otras credenciales como correctas" diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po index d0650773d3c..9946b227e27 100644 --- a/l10n/es_AR/settings.po +++ b/l10n/es_AR/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -119,27 +119,27 @@ msgstr "-licenciado por " #: templates/help.php:3 msgid "User Documentation" -msgstr "" +msgstr "Documentación de Usuario" #: templates/help.php:4 msgid "Administrator Documentation" -msgstr "" +msgstr "Documentación de Administrador" #: templates/help.php:6 msgid "Online Documentation" -msgstr "" +msgstr "Documentación en linea" #: templates/help.php:7 msgid "Forum" -msgstr "" +msgstr "Foro" #: templates/help.php:9 msgid "Bugtracker" -msgstr "" +msgstr "Informar errores" #: templates/help.php:11 msgid "Commercial Support" -msgstr "" +msgstr "Soporte comercial" #: templates/personal.php:8 #, php-format @@ -152,17 +152,17 @@ msgstr "Clientes" #: templates/personal.php:13 msgid "Download Desktop Clients" -msgstr "" +msgstr "Descargar clientes de escritorio" #: templates/personal.php:14 msgid "Download Android Client" -msgstr "" +msgstr "Descargar cliente de Android" #: templates/personal.php:15 msgid "Download iOS Client" -msgstr "" +msgstr "Descargar cliente de iOS" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Contraseña" @@ -212,15 +212,15 @@ msgstr "Ayudanos a traducir" #: templates/personal.php:52 msgid "WebDAV" -msgstr "" +msgstr "WebDAV" #: templates/personal.php:54 msgid "Use this address to connect to your ownCloud in your file manager" -msgstr "" +msgstr "Utiliza esta dirección para conectarte con ownCloud en tu Administrador de Archivos" #: templates/personal.php:63 msgid "Version" -msgstr "" +msgstr "Versión" #: templates/personal.php:65 msgid "" @@ -232,11 +232,11 @@ msgid "" "License\">AGPL." msgstr "Desarrollado por la comunidad ownCloud, el código fuente está bajo licencia AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Nombre" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Grupos" @@ -245,21 +245,29 @@ msgid "Create" msgstr "Crear" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Cuota predeterminada" +msgid "Default Storage" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Otro" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Grupo Administrador" -#: templates/users.php:82 -msgid "Quota" -msgstr "Cuota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Borrar" diff --git a/l10n/es_AR/user_webdavauth.po b/l10n/es_AR/user_webdavauth.po index e3165d3da3d..5eb7c5b084b 100644 --- a/l10n/es_AR/user_webdavauth.po +++ b/l10n/es_AR/user_webdavauth.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Agustin Ferrario , 2012. # , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:12+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 21:34+0000\n" +"Last-Translator: Agustin Ferrario \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" @@ -20,11 +21,11 @@ msgstr "" #: templates/settings.php:4 msgid "URL: http://" -msgstr "" +msgstr "URL: http://" #: templates/settings.php:6 msgid "" "ownCloud will send the user credentials to this URL is interpret http 401 " "and http 403 as credentials wrong and all other codes as credentials " "correct." -msgstr "" +msgstr "ownCloud enviará las credenciales a esta dirección, si son interpretadas como http 401 o http 403 las credenciales son erroneas; todos los otros códigos indican que las credenciales son correctas." diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po index 0212408126c..42f157b4e7c 100644 --- a/l10n/et_EE/settings.po +++ b/l10n/et_EE/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -162,7 +162,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Parool" @@ -232,11 +232,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Nimi" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Grupid" @@ -245,21 +245,29 @@ msgid "Create" msgstr "Lisa" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Vaikimisi kvoot" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Muu" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Grupi admin" -#: templates/users.php:82 -msgid "Quota" -msgstr "Mahupiir" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Kustuta" diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po index 88627e3567b..cf8c43c710b 100644 --- a/l10n/eu/settings.po +++ b/l10n/eu/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-28 00:20+0100\n" -"PO-Revision-Date: 2012-12-27 20:53+0000\n" -"Last-Translator: asieriko \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -163,7 +163,7 @@ msgstr "Deskargatu Android bezeroa" msgid "Download iOS Client" msgstr "Deskargatu iOS bezeroa" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Pasahitza" @@ -233,11 +233,11 @@ msgid "" "License\">AGPL." msgstr "ownCloud komunitateak garatuta, itubruru kodeaAGPL lizentziarekin banatzen da." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Izena" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Taldeak" @@ -246,21 +246,29 @@ msgid "Create" msgstr "Sortu" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Kuota lehentsia" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Besteak" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Talde administradorea" -#: templates/users.php:82 -msgid "Quota" -msgstr "Kuota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Ezabatu" diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po index 3d7035f89a2..55f1ea97204 100644 --- a/l10n/fa/settings.po +++ b/l10n/fa/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: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -164,7 +164,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "گذرواژه" @@ -234,11 +234,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "نام" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "گروه ها" @@ -247,21 +247,29 @@ msgid "Create" msgstr "ایجاد کردن" #: templates/users.php:35 -msgid "Default Quota" -msgstr "سهم پیش فرض" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "سایر" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "" -#: templates/users.php:82 -msgid "Quota" -msgstr "سهم" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "پاک کردن" diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po index 18876d4aa6b..0b52b4e2f60 100644 --- a/l10n/fi_FI/settings.po +++ b/l10n/fi_FI/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-22 00:24+0100\n" -"PO-Revision-Date: 2012-12-21 17:40+0000\n" -"Last-Translator: Jiri Grönroos \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -163,7 +163,7 @@ msgstr "Lataa Android-sovellus" msgid "Download iOS Client" msgstr "Lataa iOS-sovellus" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Salasana" @@ -233,11 +233,11 @@ msgid "" "License\">AGPL." msgstr "Kehityksestä on vastannut ownCloud-yhteisö, lähdekoodi on julkaistu lisenssin AGPL alaisena." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Nimi" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Ryhmät" @@ -246,21 +246,29 @@ msgid "Create" msgstr "Luo" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Oletuskiintiö" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Muu" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Ryhmän ylläpitäjä" -#: templates/users.php:82 -msgid "Quota" -msgstr "Kiintiö" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Poista" diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po index 3d95e66bbea..1076e0b9797 100644 --- a/l10n/fr/settings.po +++ b/l10n/fr/settings.po @@ -21,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-25 00:10+0100\n" -"PO-Revision-Date: 2012-12-24 14:10+0000\n" -"Last-Translator: mishka \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -174,7 +174,7 @@ msgstr "Télécharger le client Android" msgid "Download iOS Client" msgstr "Télécharger le client iOS" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Mot de passe" @@ -244,11 +244,11 @@ msgid "" "License\">AGPL." msgstr "Développé par la communauté ownCloud, le code source est publié sous license AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Nom" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Groupes" @@ -257,21 +257,29 @@ msgid "Create" msgstr "Créer" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Quota par défaut" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Autre" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Groupe Admin" -#: templates/users.php:82 -msgid "Quota" -msgstr "Quota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Supprimer" diff --git a/l10n/fr/user_webdavauth.po b/l10n/fr/user_webdavauth.po index 4d2c6a78376..4917efe0505 100644 --- a/l10n/fr/user_webdavauth.po +++ b/l10n/fr/user_webdavauth.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. # Robert Di Rosa <>, 2012. # Romain DEP. , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:12+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-28 23:13+0000\n" +"Last-Translator: ouafnico \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" @@ -21,7 +22,7 @@ msgstr "" #: templates/settings.php:4 msgid "URL: http://" -msgstr "" +msgstr "URL : http://" #: templates/settings.php:6 msgid "" diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po index 234468f6e0a..e2ef6571062 100644 --- a/l10n/gl/settings.po +++ b/l10n/gl/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -162,7 +162,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Contrasinal" @@ -232,11 +232,11 @@ msgid "" "License\">AGPL." msgstr "Desenvolvido pola comunidade ownCloud, o código fonte está baixo a licenza AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Nome" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Grupos" @@ -245,21 +245,29 @@ msgid "Create" msgstr "Crear" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Cota por omisión" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Outro" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Grupo Admin" -#: templates/users.php:82 -msgid "Quota" -msgstr "Cota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Borrar" diff --git a/l10n/he/settings.po b/l10n/he/settings.po index 1fe9d7e737f..4dd6b3fe8d4 100644 --- a/l10n/he/settings.po +++ b/l10n/he/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-27 00:04+0100\n" -"PO-Revision-Date: 2012-12-26 14:12+0000\n" -"Last-Translator: Gilad Naaman \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -164,7 +164,7 @@ msgstr "הורד תוכנה לאנדרואיד" msgid "Download iOS Client" msgstr "הורד תוכנה לiOS" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "ססמה" @@ -234,11 +234,11 @@ msgid "" "License\">AGPL." msgstr "פותח על די קהילתownCloud, קוד המקור מוגן ברישיון AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "שם" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "קבוצות" @@ -247,21 +247,29 @@ msgid "Create" msgstr "יצירה" #: templates/users.php:35 -msgid "Default Quota" -msgstr "מכסת בררת המחדל" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "אחר" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "מנהל הקבוצה" -#: templates/users.php:82 -msgid "Quota" -msgstr "מכסה" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "מחיקה" diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po index 76241d2e5a1..5bf27381000 100644 --- a/l10n/hi/settings.po +++ b/l10n/hi/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:11+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -160,7 +160,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "पासवर्ड" @@ -230,11 +230,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "" @@ -243,21 +243,29 @@ msgid "Create" msgstr "" #: templates/users.php:35 -msgid "Default Quota" +msgid "Default Storage" msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "" -#: templates/users.php:82 -msgid "Quota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "" diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po index b46de54ca70..530e4e42e1e 100644 --- a/l10n/hr/settings.po +++ b/l10n/hr/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -163,7 +163,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Lozinka" @@ -233,11 +233,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Ime" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Grupe" @@ -246,21 +246,29 @@ msgid "Create" msgstr "Izradi" #: templates/users.php:35 -msgid "Default Quota" -msgstr "standardni kvota" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "ostali" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Grupa Admin" -#: templates/users.php:82 -msgid "Quota" -msgstr "kvota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Obriši" diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po index 4379b279a64..4270813b4c0 100644 --- a/l10n/hu_HU/files_sharing.po +++ b/l10n/hu_HU/files_sharing.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-22 01:14+0200\n" -"PO-Revision-Date: 2012-09-21 23:15+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 17:20+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" @@ -20,30 +20,30 @@ msgstr "" #: templates/authenticate.php:4 msgid "Password" -msgstr "" +msgstr "Jelszó" #: templates/authenticate.php:6 msgid "Submit" msgstr "" -#: templates/public.php:9 +#: templates/public.php:17 #, php-format msgid "%s shared the folder %s with you" msgstr "" -#: templates/public.php:11 +#: templates/public.php:19 #, php-format msgid "%s shared the file %s with you" msgstr "" -#: templates/public.php:14 templates/public.php:30 +#: templates/public.php:22 templates/public.php:38 msgid "Download" msgstr "" -#: templates/public.php:29 +#: templates/public.php:37 msgid "No preview available for" msgstr "" -#: templates/public.php:37 +#: templates/public.php:43 msgid "web services under your control" msgstr "" diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po index fcc66c8ce64..c1f721a18a4 100644 --- a/l10n/hu_HU/settings.po +++ b/l10n/hu_HU/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -25,15 +25,15 @@ msgstr "Nem tölthető le a lista az App Store-ból" #: ajax/creategroup.php:10 msgid "Group already exists" -msgstr "" +msgstr "A csoport már létezik" #: ajax/creategroup.php:19 msgid "Unable to add group" -msgstr "" +msgstr "A csoport nem hozható létre" #: ajax/enableapp.php:12 msgid "Could not enable app. " -msgstr "" +msgstr "A program nem aktiválható." #: ajax/lostpassword.php:12 msgid "Email saved" @@ -53,15 +53,15 @@ msgstr "Érvénytelen kérés" #: ajax/removegroup.php:13 msgid "Unable to delete group" -msgstr "" +msgstr "A csoport nem törölhető" #: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18 msgid "Authentication error" -msgstr "Hitelesítési hiba" +msgstr "Azonosítási hiba" #: ajax/removeuser.php:24 msgid "Unable to delete user" -msgstr "" +msgstr "A felhasználó nem törölhető" #: ajax/setlanguage.php:15 msgid "Language changed" @@ -69,17 +69,17 @@ msgstr "A nyelv megváltozott" #: ajax/togglegroups.php:12 msgid "Admins can't remove themself from the admin group" -msgstr "" +msgstr "Adminisztrátorok nem távolíthatják el magukat az admin csoportból." #: ajax/togglegroups.php:28 #, php-format msgid "Unable to add user to group %s" -msgstr "" +msgstr "A felhasználó nem adható hozzá ehhez a csoporthoz: %s" #: ajax/togglegroups.php:34 #, php-format msgid "Unable to remove user from group %s" -msgstr "" +msgstr "A felhasználó nem távolítható el ebből a csoportból: %s" #: js/apps.js:28 js/apps.js:67 msgid "Disable" @@ -99,15 +99,15 @@ msgstr "__language_name__" #: templates/apps.php:10 msgid "Add your App" -msgstr "App hozzáadása" +msgstr "Az alkalmazás hozzáadása" #: templates/apps.php:11 msgid "More Apps" -msgstr "" +msgstr "További alkalmazások" #: templates/apps.php:27 msgid "Select an App" -msgstr "Egy App kiválasztása" +msgstr "Válasszon egy alkalmazást" #: templates/apps.php:31 msgid "See application page at apps.owncloud.com" @@ -119,32 +119,32 @@ msgstr "" #: templates/help.php:3 msgid "User Documentation" -msgstr "" +msgstr "Felhasználói leírás" #: templates/help.php:4 msgid "Administrator Documentation" -msgstr "" +msgstr "Üzemeltetői leírás" #: templates/help.php:6 msgid "Online Documentation" -msgstr "" +msgstr "Online leírás" #: templates/help.php:7 msgid "Forum" -msgstr "" +msgstr "Fórum" #: templates/help.php:9 msgid "Bugtracker" -msgstr "" +msgstr "Hibabejelentések" #: templates/help.php:11 msgid "Commercial Support" -msgstr "" +msgstr "Megvásárolható támogatás" #: templates/personal.php:8 #, php-format msgid "You have used %s of the available %s" -msgstr "" +msgstr "Az Ön tárterület-felhasználása jelenleg: %s. Maximálisan ennyi áll rendelkezésére: %s" #: templates/personal.php:12 msgid "Clients" @@ -152,43 +152,43 @@ msgstr "Kliensek" #: templates/personal.php:13 msgid "Download Desktop Clients" -msgstr "" +msgstr "Desktop kliensprogramok letöltése" #: templates/personal.php:14 msgid "Download Android Client" -msgstr "" +msgstr "Android kliens letöltése" #: templates/personal.php:15 msgid "Download iOS Client" -msgstr "" +msgstr "iOS kliens letöltése" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Jelszó" #: templates/personal.php:22 msgid "Your password was changed" -msgstr "" +msgstr "A jelszava megváltozott" #: templates/personal.php:23 msgid "Unable to change your password" -msgstr "Nem lehet megváltoztatni a jelszavad" +msgstr "A jelszó nem változtatható meg" #: templates/personal.php:24 msgid "Current password" -msgstr "Jelenlegi jelszó" +msgstr "A jelenlegi jelszó" #: templates/personal.php:25 msgid "New password" -msgstr "Új jelszó" +msgstr "Az új jelszó" #: templates/personal.php:26 msgid "show" -msgstr "Mutat" +msgstr "lássam" #: templates/personal.php:27 msgid "Change password" -msgstr "Jelszó megváltoztatása" +msgstr "A jelszó megváltoztatása" #: templates/personal.php:33 msgid "Email" @@ -196,11 +196,11 @@ msgstr "Email" #: templates/personal.php:34 msgid "Your email address" -msgstr "Email címed" +msgstr "Az Ön emailcíme" #: templates/personal.php:35 msgid "Fill in an email address to enable password recovery" -msgstr "Töltsd ki az email címet, hogy engedélyezhesd a jelszó-visszaállítást" +msgstr "Töltse ki az emailcímet, hogy jelszó-emlékeztetőt kérhessen, ha elfelejtette a jelszavát!" #: templates/personal.php:41 templates/personal.php:42 msgid "Language" @@ -208,19 +208,19 @@ msgstr "Nyelv" #: templates/personal.php:47 msgid "Help translate" -msgstr "Segíts lefordítani!" +msgstr "Segítsen a fordításban!" #: templates/personal.php:52 msgid "WebDAV" -msgstr "" +msgstr "WebDAV elérés: " #: templates/personal.php:54 msgid "Use this address to connect to your ownCloud in your file manager" -msgstr "" +msgstr "Ennek a címnek a megadásával a WebDAV-protokollon keresztül saját gépének fájlkezelőjével is is elérheti az állományait." #: templates/personal.php:63 msgid "Version" -msgstr "" +msgstr "Verzió" #: templates/personal.php:65 msgid "" @@ -232,11 +232,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Név" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Csoportok" @@ -245,21 +245,29 @@ msgid "Create" msgstr "Létrehozás" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Alapértelmezett kvóta" +msgid "Default Storage" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:60 templates/users.php:153 msgid "Other" -msgstr "Egyéb" +msgstr "Más" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" +msgstr "Csoportadminisztrátor" + +#: templates/users.php:87 +msgid "Storage" msgstr "" -#: templates/users.php:82 -msgid "Quota" -msgstr "Kvóta" +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Törlés" diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po index 330b4cd1465..655c88dd46a 100644 --- a/l10n/hu_HU/user_ldap.po +++ b/l10n/hu_HU/user_ldap.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 17:19+0000\n" +"Last-Translator: Laszlo Tornoci \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" @@ -22,34 +22,34 @@ 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 "Figyelem: a user_ldap és user_webdavauth alkalmazások nem kompatibilisek. Együttes használatuk váratlan eredményekhez vezethet. Kérje meg a rendszergazdát, hogy a kettő közül kapcsolja ki az egyiket." #: templates/settings.php:11 msgid "" "Warning: The PHP LDAP module needs is not installed, the backend will" " not work. Please ask your system administrator to install it." -msgstr "" +msgstr "Figyelem: a szükséges PHP LDAP modul nincs telepítve. Enélkül az LDAP azonosítás nem fog működni. Kérje meg a rendszergazdát, hogy telepítse a szükséges modult!" #: templates/settings.php:15 msgid "Host" -msgstr "" +msgstr "Kiszolgáló" #: templates/settings.php:15 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" -msgstr "" +msgstr "A protokoll előtag elhagyható, kivéve, ha SSL-t kíván használni. Ebben az esetben kezdje így: ldaps://" #: templates/settings.php:16 msgid "Base DN" -msgstr "" +msgstr "DN-gyökér" #: templates/settings.php:16 msgid "You can specify Base DN for users and groups in the Advanced tab" -msgstr "" +msgstr "A Haladó fülre kattintva külön DN-gyökér állítható be a felhasználók és a csoportok számára" #: templates/settings.php:17 msgid "User DN" -msgstr "" +msgstr "A kapcsolódó felhasználó DN-je" #: templates/settings.php:17 msgid "" @@ -60,51 +60,51 @@ msgstr "" #: templates/settings.php:18 msgid "Password" -msgstr "" +msgstr "Jelszó" #: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." -msgstr "" +msgstr "Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!" #: templates/settings.php:19 msgid "User Login Filter" -msgstr "" +msgstr "Szűrő a bejelentkezéshez" #: templates/settings.php:19 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." -msgstr "" +msgstr "Ez a szűrő érvényes a bejelentkezés megkísérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül." #: templates/settings.php:19 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" -msgstr "" +msgstr "használja az %%uid változót, pl. \"uid=%%uid\"" #: templates/settings.php:20 msgid "User List Filter" -msgstr "" +msgstr "A felhasználók szűrője" #: templates/settings.php:20 msgid "Defines the filter to apply, when retrieving users." -msgstr "" +msgstr "Ez a szűrő érvényes a felhasználók listázásakor." #: templates/settings.php:20 msgid "without any placeholder, e.g. \"objectClass=person\"." -msgstr "" +msgstr "itt ne használjon változót, pl. \"objectClass=person\"." #: templates/settings.php:21 msgid "Group Filter" -msgstr "" +msgstr "A csoportok szűrője" #: templates/settings.php:21 msgid "Defines the filter to apply, when retrieving groups." -msgstr "" +msgstr "Ez a szűrő érvényes a csoportok listázásakor." #: templates/settings.php:21 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." -msgstr "" +msgstr "itt ne használjunk változót, pl. \"objectClass=posixGroup\"." #: templates/settings.php:24 msgid "Port" @@ -112,72 +112,72 @@ msgstr "" #: templates/settings.php:25 msgid "Base User Tree" -msgstr "" +msgstr "A felhasználói fa gyökere" #: templates/settings.php:26 msgid "Base Group Tree" -msgstr "" +msgstr "A csoportfa gyökere" #: templates/settings.php:27 msgid "Group-Member association" -msgstr "" +msgstr "A csoporttagság attribútuma" #: templates/settings.php:28 msgid "Use TLS" -msgstr "" +msgstr "Használjunk TLS-t" #: templates/settings.php:28 msgid "Do not use it for SSL connections, it will fail." -msgstr "" +msgstr "Ne használjuk SSL-kapcsolat esetén, mert nem fog működni!" #: templates/settings.php:29 msgid "Case insensitve LDAP server (Windows)" -msgstr "" +msgstr "Az LDAP-kiszolgáló nem tesz különbséget a kis- és nagybetűk között (Windows)" #: templates/settings.php:30 msgid "Turn off SSL certificate validation." -msgstr "" +msgstr "Ne ellenőrizzük az SSL-tanúsítvány érvényességét" #: templates/settings.php:30 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." -msgstr "" +msgstr "Ha a kapcsolat csak ezzel a beállítással működik, akkor importálja az LDAP-kiszolgáló SSL tanúsítványát az ownCloud kiszolgálóra!" #: templates/settings.php:30 msgid "Not recommended, use for testing only." -msgstr "" +msgstr "Nem javasolt, csak tesztelésre érdemes használni." #: templates/settings.php:31 msgid "User Display Name Field" -msgstr "" +msgstr "A felhasználónév mezője" #: templates/settings.php:31 msgid "The LDAP attribute to use to generate the user`s ownCloud name." -msgstr "" +msgstr "Ebből az LDAP attribútumból képződik a felhasználó elnevezése, ami megjelenik az ownCloudban." #: templates/settings.php:32 msgid "Group Display Name Field" -msgstr "" +msgstr "A csoport nevének mezője" #: templates/settings.php:32 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." -msgstr "" +msgstr "Ebből az LDAP attribútumból képződik a csoport elnevezése, ami megjelenik az ownCloudban." #: templates/settings.php:34 msgid "in bytes" -msgstr "" +msgstr "bájtban" #: templates/settings.php:36 msgid "in seconds. A change empties the cache." -msgstr "" +msgstr "másodpercben. A változtatás törli a cache tartalmát." #: templates/settings.php:37 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." -msgstr "" +msgstr "Hagyja üresen, ha a felhasználónevet kívánja használni. Ellenkező esetben adjon meg egy LDAP/AD attribútumot!" #: templates/settings.php:39 msgid "Help" -msgstr "" +msgstr "Súgó" diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po index 892fdc95fd9..5030c5a00a3 100644 --- a/l10n/ia/settings.po +++ b/l10n/ia/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -162,7 +162,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Contrasigno" @@ -232,11 +232,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Nomine" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Gruppos" @@ -245,21 +245,29 @@ msgid "Create" msgstr "Crear" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Quota predeterminate" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Altere" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "" -#: templates/users.php:82 -msgid "Quota" -msgstr "Quota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Deler" diff --git a/l10n/id/settings.po b/l10n/id/settings.po index 4e52623ad95..1abd347dc88 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: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -164,7 +164,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Password" @@ -234,11 +234,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Nama" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Group" @@ -247,21 +247,29 @@ msgid "Create" msgstr "Buat" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Kuota default" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Lain-lain" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Admin Grup" -#: templates/users.php:82 -msgid "Quota" -msgstr "Quota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Hapus" diff --git a/l10n/is/settings.po b/l10n/is/settings.po index 5872b39972e..3842a0e149f 100644 --- a/l10n/is/settings.po +++ b/l10n/is/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:11+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -160,7 +160,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "" @@ -230,11 +230,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "" @@ -243,21 +243,29 @@ msgid "Create" msgstr "" #: templates/users.php:35 -msgid "Default Quota" +msgid "Default Storage" msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "" -#: templates/users.php:82 -msgid "Quota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "" diff --git a/l10n/it/settings.po b/l10n/it/settings.po index e26395a5f44..00d5a41c44a 100644 --- a/l10n/it/settings.po +++ b/l10n/it/settings.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-20 06:39+0000\n" -"Last-Translator: Vincenzo Reale \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -167,7 +167,7 @@ msgstr "Scarica client Android" msgid "Download iOS Client" msgstr "Scarica client iOS" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Password" @@ -237,11 +237,11 @@ msgid "" "License\">AGPL." msgstr "Sviluppato dalla comunità di ownCloud, il codice sorgente è licenziato nei termini della AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Nome" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Gruppi" @@ -250,21 +250,29 @@ msgid "Create" msgstr "Crea" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Quota predefinita" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Altro" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Gruppo di amministrazione" -#: templates/users.php:82 -msgid "Quota" -msgstr "Quote" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Elimina" diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po index b41038ab9a7..c1f06322310 100644 --- a/l10n/ja_JP/settings.po +++ b/l10n/ja_JP/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-20 03:44+0000\n" -"Last-Translator: Daisuke Deguchi \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -164,7 +164,7 @@ msgstr "Androidクライアントをダウンロード" msgid "Download iOS Client" msgstr "iOSクライアントをダウンロード" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "パスワード" @@ -234,11 +234,11 @@ msgid "" "License\">AGPL." msgstr "ownCloud communityにより開発されています、ソースコードライセンスは、AGPL ライセンスにより提供されています。" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "名前" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "グループ" @@ -247,21 +247,29 @@ msgid "Create" msgstr "作成" #: templates/users.php:35 -msgid "Default Quota" -msgstr "デフォルトのクォータサイズ" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "その他" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "グループ管理者" -#: templates/users.php:82 -msgid "Quota" -msgstr "クオータ" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "削除" diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po index 363ba8a6bd4..8d92cc3af03 100644 --- a/l10n/ka_GE/settings.po +++ b/l10n/ka_GE/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -161,7 +161,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "პაროლი" @@ -231,11 +231,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "სახელი" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "ჯგუფი" @@ -244,21 +244,29 @@ msgid "Create" msgstr "შექმნა" #: templates/users.php:35 -msgid "Default Quota" -msgstr "საწყისი ქვოტა" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "სხვა" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "ჯგუფის ადმინისტრატორი" -#: templates/users.php:82 -msgid "Quota" -msgstr "ქვოტა" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "წაშლა" diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po index 7e948772a38..ea5f2c1fc67 100644 --- a/l10n/ko/settings.po +++ b/l10n/ko/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -163,7 +163,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "암호" @@ -233,11 +233,11 @@ msgid "" "License\">AGPL." msgstr "ownCloud 커뮤니티에 의해서 개발되었습니다. 원본 코드는 AGPL에 따라 사용이 허가됩니다." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "이름" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "그룹" @@ -246,21 +246,29 @@ msgid "Create" msgstr "만들기" #: templates/users.php:35 -msgid "Default Quota" -msgstr "기본 할당량" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "기타" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "그룹 관리자" -#: templates/users.php:82 -msgid "Quota" -msgstr "할당량" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "삭제" diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po index 535d2af3759..a1dddc85d5d 100644 --- a/l10n/ku_IQ/settings.po +++ b/l10n/ku_IQ/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:11+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -160,7 +160,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "وشەی تێپەربو" @@ -230,11 +230,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "ناو" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "" @@ -243,21 +243,29 @@ msgid "Create" msgstr "" #: templates/users.php:35 -msgid "Default Quota" +msgid "Default Storage" msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "" -#: templates/users.php:82 -msgid "Quota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "" diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po index 90bde23fab6..cf0f377fcb9 100644 --- a/l10n/lb/settings.po +++ b/l10n/lb/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -161,7 +161,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Passwuert" @@ -231,11 +231,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Numm" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Gruppen" @@ -244,21 +244,29 @@ msgid "Create" msgstr "Erstellen" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Standard Quota" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Aner" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Gruppen Admin" -#: templates/users.php:82 -msgid "Quota" -msgstr "Quota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Läschen" diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po index 34f05c7c008..8622a3a7a26 100644 --- a/l10n/lt_LT/settings.po +++ b/l10n/lt_LT/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -162,7 +162,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Slaptažodis" @@ -232,11 +232,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Vardas" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Grupės" @@ -245,21 +245,29 @@ msgid "Create" msgstr "Sukurti" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Numatytoji kvota" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Kita" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "" -#: templates/users.php:82 -msgid "Quota" -msgstr "Limitas" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Ištrinti" diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po index 22fd0c4bb2e..6bac98259c8 100644 --- a/l10n/lv/settings.po +++ b/l10n/lv/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:11+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -162,7 +162,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Parole" @@ -232,11 +232,11 @@ msgid "" "License\">AGPL." msgstr "IzstrādājusiownCloud kopiena,pirmkodukurš ir licencēts zem AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Vārds" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Grupas" @@ -245,21 +245,29 @@ msgid "Create" msgstr "Izveidot" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Apjoms pēc noklusējuma" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Cits" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Grupas administrators" -#: templates/users.php:82 -msgid "Quota" -msgstr "Apjoms" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Izdzēst" diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po index 3195e2e0539..0f4d756335e 100644 --- a/l10n/mk/settings.po +++ b/l10n/mk/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-22 00:24+0100\n" -"PO-Revision-Date: 2012-12-21 13:39+0000\n" -"Last-Translator: Georgi Stanojevski \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -163,7 +163,7 @@ msgstr "Преземи клиент за Андроид" msgid "Download iOS Client" msgstr "Преземи iOS клиент" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Лозинка" @@ -233,11 +233,11 @@ msgid "" "License\">AGPL." msgstr "Развој од ownCloud заедницата, изворниот код е лиценциран соAGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Име" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Групи" @@ -246,21 +246,29 @@ msgid "Create" msgstr "Создај" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Предефинирана квота" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Останато" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Администратор на група" -#: templates/users.php:82 -msgid "Quota" -msgstr "Квота" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Избриши" diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po index f4c24535347..444196b7ee8 100644 --- a/l10n/ms_MY/settings.po +++ b/l10n/ms_MY/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: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -164,7 +164,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Kata laluan " @@ -234,11 +234,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Nama" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Kumpulan" @@ -247,21 +247,29 @@ msgid "Create" msgstr "Buat" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Kuota Lalai" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Lain" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "" -#: templates/users.php:82 -msgid "Quota" -msgstr "Kuota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Padam" diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po index 7354a7de4ce..df292b0cea6 100644 --- a/l10n/nb_NO/core.po +++ b/l10n/nb_NO/core.po @@ -6,6 +6,7 @@ # , 2011, 2012. # Christer Eriksson , 2012. # Daniel , 2012. +# , 2012. # , 2012. # , 2012. # , 2012. @@ -13,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-12 23:17+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 16:28+0000\n" +"Last-Translator: espenbye \n" "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -103,11 +104,11 @@ msgstr "{minutes} minutter siden" #: js/js.js:707 msgid "1 hour ago" -msgstr "" +msgstr "1 time siden" #: js/js.js:708 msgid "{hours} hours ago" -msgstr "" +msgstr "{hours} timer siden" #: js/js.js:709 msgid "today" @@ -127,7 +128,7 @@ msgstr "forrige måned" #: js/js.js:713 msgid "{months} months ago" -msgstr "" +msgstr "{months} måneder siden" #: js/js.js:714 msgid "months ago" @@ -167,8 +168,8 @@ 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:135 js/share.js:142 js/share.js:541 -#: js/share.js:553 +#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554 +#: js/share.js:566 msgid "Error" msgstr "Feil" @@ -180,7 +181,7 @@ msgstr "" msgid "The required file {file} is not installed!" msgstr "" -#: js/share.js:124 js/share.js:581 +#: js/share.js:124 js/share.js:594 msgid "Error while sharing" msgstr "Feil under deling" @@ -208,11 +209,11 @@ msgstr "Del med" msgid "Share with link" msgstr "Del med link" -#: js/share.js:164 +#: js/share.js:166 msgid "Password protect" msgstr "Passordbeskyttet" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:35 #: templates/verify.php:13 msgid "Password" msgstr "Passord" @@ -223,7 +224,7 @@ msgstr "" #: js/share.js:173 msgid "Send" -msgstr "" +msgstr "Send" #: js/share.js:177 msgid "Set expiration date" @@ -277,25 +278,25 @@ msgstr "slett" msgid "share" msgstr "del" -#: js/share.js:353 js/share.js:528 js/share.js:530 +#: js/share.js:356 js/share.js:541 msgid "Password protected" msgstr "Passordbeskyttet" -#: js/share.js:541 +#: js/share.js:554 msgid "Error unsetting expiration date" msgstr "" -#: js/share.js:553 +#: js/share.js:566 msgid "Error setting expiration date" msgstr "Kan ikke sette utløpsdato" -#: js/share.js:568 +#: js/share.js:581 msgid "Sending ..." -msgstr "" +msgstr "Sender..." -#: js/share.js:579 +#: js/share.js:592 msgid "Email sent" -msgstr "" +msgstr "E-post sendt" #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -317,8 +318,8 @@ msgstr "" msgid "Request failed!" msgstr "" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:28 msgid "Username" msgstr "Brukernavn" @@ -407,44 +408,44 @@ msgstr "" msgid "Create an admin account" msgstr "opprett en administrator-konto" -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" msgstr "Avansert" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" msgstr "Datamappe" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" msgstr "Konfigurer databasen" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" msgstr "vil bli brukt" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" msgstr "Databasebruker" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" msgstr "Databasepassord" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" msgstr "Databasenavn" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" msgstr "Database tabellområde" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" msgstr "Databasevert" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" msgstr "Fullfør oppsetting" @@ -532,29 +533,29 @@ msgstr "nettjenester under din kontroll" msgid "Log out" msgstr "Logg ut" -#: templates/login.php:8 +#: templates/login.php:10 msgid "Automatic logon rejected!" msgstr "Automatisk pålogging avvist!" -#: templates/login.php:9 +#: templates/login.php:11 msgid "" "If you did not change your password recently, your account may be " "compromised!" msgstr "Hvis du ikke har endret passordet ditt nylig kan kontoen din være kompromitert" -#: templates/login.php:10 +#: templates/login.php:13 msgid "Please change your password to secure your account again." msgstr "Vennligst skift passord for å gjøre kontoen din sikker igjen." -#: templates/login.php:15 +#: templates/login.php:19 msgid "Lost your password?" msgstr "Mistet passordet ditt?" -#: templates/login.php:27 +#: templates/login.php:39 msgid "remember" msgstr "husk" -#: templates/login.php:28 +#: templates/login.php:41 msgid "Log in" msgstr "Logg inn" diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po index ad0cf919ea0..58b1183863d 100644 --- a/l10n/nb_NO/files.po +++ b/l10n/nb_NO/files.po @@ -7,6 +7,7 @@ # Arvid Nornes , 2012. # Christer Eriksson , 2012. # Daniel , 2012. +# , 2012. # , 2012. # , 2012. # , 2012. @@ -15,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-01 00:01+0100\n" -"PO-Revision-Date: 2012-11-30 23:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 17:25+0000\n" +"Last-Translator: espenbye \n" "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -60,11 +61,11 @@ msgstr "Klarte ikke å skrive til disk" msgid "Files" msgstr "Filer" -#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84 +#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85 msgid "Unshare" msgstr "Avslutt deling" -#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90 +#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91 msgid "Delete" msgstr "Slett" @@ -72,39 +73,39 @@ msgstr "Slett" msgid "Rename" msgstr "Omdøp" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "{new_name} already exists" msgstr "{new_name} finnes allerede" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "replace" msgstr "erstatt" -#: js/filelist.js:201 +#: js/filelist.js:199 msgid "suggest name" msgstr "foreslå navn" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "cancel" msgstr "avbryt" -#: js/filelist.js:250 +#: js/filelist.js:248 msgid "replaced {new_name}" msgstr "erstatt {new_name}" -#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286 +#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284 msgid "undo" msgstr "angre" -#: js/filelist.js:252 +#: js/filelist.js:250 msgid "replaced {new_name} with {old_name}" msgstr "erstatt {new_name} med {old_name}" -#: js/filelist.js:284 +#: js/filelist.js:282 msgid "unshared {files}" msgstr "" -#: js/filelist.js:286 +#: js/filelist.js:284 msgid "deleted {files}" msgstr "slettet {files}" @@ -112,82 +113,82 @@ msgstr "slettet {files}" msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt." -#: js/files.js:183 +#: js/files.js:174 msgid "generating ZIP-file, it may take some time." msgstr "opprettet ZIP-fil, dette kan ta litt tid" -#: js/files.js:218 +#: js/files.js:212 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes" -#: js/files.js:218 +#: js/files.js:212 msgid "Upload Error" msgstr "Opplasting feilet" -#: js/files.js:235 +#: js/files.js:229 msgid "Close" msgstr "Lukk" -#: js/files.js:254 js/files.js:368 js/files.js:398 +#: js/files.js:248 js/files.js:362 js/files.js:392 msgid "Pending" msgstr "Ventende" -#: js/files.js:274 +#: js/files.js:268 msgid "1 file uploading" msgstr "1 fil lastes opp" -#: js/files.js:277 js/files.js:331 js/files.js:346 +#: js/files.js:271 js/files.js:325 js/files.js:340 msgid "{count} files uploading" msgstr "{count} filer laster opp" -#: js/files.js:349 js/files.js:382 +#: js/files.js:343 js/files.js:376 msgid "Upload cancelled." msgstr "Opplasting avbrutt." -#: js/files.js:451 +#: js/files.js:445 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen." -#: js/files.js:523 +#: js/files.js:515 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" -msgstr "" +msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud." -#: js/files.js:704 +#: js/files.js:699 msgid "{count} files scanned" msgstr "{count} filer lest inn" -#: js/files.js:712 +#: js/files.js:707 msgid "error while scanning" msgstr "feil under skanning" -#: js/files.js:785 templates/index.php:65 +#: js/files.js:780 templates/index.php:66 msgid "Name" msgstr "Navn" -#: js/files.js:786 templates/index.php:76 +#: js/files.js:781 templates/index.php:77 msgid "Size" msgstr "Størrelse" -#: js/files.js:787 templates/index.php:78 +#: js/files.js:782 templates/index.php:79 msgid "Modified" msgstr "Endret" -#: js/files.js:814 +#: js/files.js:801 msgid "1 folder" msgstr "1 mappe" -#: js/files.js:816 +#: js/files.js:803 msgid "{count} folders" msgstr "{count} mapper" -#: js/files.js:824 +#: js/files.js:811 msgid "1 file" msgstr "1 fil" -#: js/files.js:826 +#: js/files.js:813 msgid "{count} files" msgstr "{count} filer" @@ -237,7 +238,7 @@ msgstr "Mappe" #: templates/index.php:14 msgid "From link" -msgstr "" +msgstr "Fra link" #: templates/index.php:35 msgid "Upload" @@ -247,28 +248,28 @@ msgstr "Last opp" msgid "Cancel upload" msgstr "Avbryt opplasting" -#: templates/index.php:57 +#: templates/index.php:58 msgid "Nothing in here. Upload something!" msgstr "Ingenting her. Last opp noe!" -#: templates/index.php:71 +#: templates/index.php:72 msgid "Download" msgstr "Last ned" -#: templates/index.php:103 +#: templates/index.php:104 msgid "Upload too large" msgstr "Opplasting for stor" -#: templates/index.php:105 +#: templates/index.php:106 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Filene du prøver å laste opp er for store for å laste opp til denne serveren." -#: templates/index.php:110 +#: templates/index.php:111 msgid "Files are being scanned, please wait." msgstr "Skanner etter filer, vennligst vent." -#: templates/index.php:113 +#: templates/index.php:114 msgid "Current scanning" msgstr "Pågående skanning" diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po index 266ba36b069..abaf9fc0847 100644 --- a/l10n/nb_NO/lib.po +++ b/l10n/nb_NO/lib.po @@ -4,6 +4,7 @@ # # Translators: # Arvid Nornes , 2012. +# , 2012. # , 2012. # , 2012. # , 2012. @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-16 00:02+0100\n" -"PO-Revision-Date: 2012-11-14 23:13+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 17:26+0000\n" +"Last-Translator: espenbye \n" "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,43 +22,43 @@ msgstr "" "Language: nb_NO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:285 +#: app.php:287 msgid "Help" msgstr "Hjelp" -#: app.php:292 +#: app.php:294 msgid "Personal" msgstr "Personlig" -#: app.php:297 +#: app.php:299 msgid "Settings" msgstr "Innstillinger" -#: app.php:302 +#: app.php:304 msgid "Users" msgstr "Brukere" -#: app.php:309 +#: app.php:311 msgid "Apps" msgstr "Apper" -#: app.php:311 +#: app.php:313 msgid "Admin" msgstr "Admin" -#: files.php:332 +#: files.php:365 msgid "ZIP download is turned off." msgstr "ZIP-nedlasting av avslått" -#: files.php:333 +#: files.php:366 msgid "Files need to be downloaded one by one." msgstr "Filene må lastes ned en om gangen" -#: files.php:333 files.php:358 +#: files.php:366 files.php:391 msgid "Back to Files" msgstr "Tilbake til filer" -#: files.php:357 +#: files.php:390 msgid "Selected files too large to generate zip file." msgstr "De valgte filene er for store til å kunne generere ZIP-fil" @@ -91,7 +92,7 @@ msgstr "sekunder siden" #: template.php:104 msgid "1 minute ago" -msgstr "1 minuitt siden" +msgstr "1 minutt siden" #: template.php:105 #, php-format @@ -100,12 +101,12 @@ msgstr "%d minutter siden" #: template.php:106 msgid "1 hour ago" -msgstr "" +msgstr "1 time siden" #: template.php:107 #, php-format msgid "%d hours ago" -msgstr "" +msgstr "%d timer siden" #: template.php:108 msgid "today" @@ -127,7 +128,7 @@ msgstr "forrige måned" #: template.php:112 #, php-format msgid "%d months ago" -msgstr "" +msgstr "%d måneder siden" #: template.php:113 msgid "last year" @@ -153,4 +154,4 @@ msgstr "versjonssjekk er avslått" #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" -msgstr "" +msgstr "Kunne ikke finne kategori \"%s\"" diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po index 96e64f4b1a8..36c3224748b 100644 --- a/l10n/nb_NO/settings.po +++ b/l10n/nb_NO/settings.po @@ -7,6 +7,7 @@ # Arvid Nornes , 2012. # Christer Eriksson , 2012. # Daniel , 2012. +# , 2012. # , 2012. # , 2012. # , 2012. @@ -14,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -124,11 +125,11 @@ msgstr "" #: templates/help.php:3 msgid "User Documentation" -msgstr "" +msgstr "Brukerdokumentasjon" #: templates/help.php:4 msgid "Administrator Documentation" -msgstr "" +msgstr "Administratordokumentasjon" #: templates/help.php:6 msgid "Online Documentation" @@ -144,12 +145,12 @@ msgstr "" #: templates/help.php:11 msgid "Commercial Support" -msgstr "" +msgstr "Kommersiell støtte" #: templates/personal.php:8 #, php-format msgid "You have used %s of the available %s" -msgstr "" +msgstr "Du har brukt %s av tilgjengelig %s" #: templates/personal.php:12 msgid "Clients" @@ -157,17 +158,17 @@ msgstr "Klienter" #: templates/personal.php:13 msgid "Download Desktop Clients" -msgstr "" +msgstr "Last ned skrivebordsklienter" #: templates/personal.php:14 msgid "Download Android Client" -msgstr "" +msgstr "Last ned Android-klient" #: templates/personal.php:15 msgid "Download iOS Client" -msgstr "" +msgstr "Last ned iOS-klient" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Passord" @@ -217,7 +218,7 @@ msgstr "Bidra til oversettelsen" #: templates/personal.php:52 msgid "WebDAV" -msgstr "" +msgstr "WebDAV" #: templates/personal.php:54 msgid "Use this address to connect to your ownCloud in your file manager" @@ -225,7 +226,7 @@ msgstr "" #: templates/personal.php:63 msgid "Version" -msgstr "" +msgstr "Versjon" #: templates/personal.php:65 msgid "" @@ -237,11 +238,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Navn" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Grupper" @@ -250,21 +251,29 @@ msgid "Create" msgstr "Opprett" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Standard Kvote" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Annet" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Gruppeadministrator" -#: templates/users.php:82 -msgid "Quota" -msgstr "Kvote" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Slett" diff --git a/l10n/nb_NO/user_webdavauth.po b/l10n/nb_NO/user_webdavauth.po index c3f368c7777..9d7d3571927 100644 --- a/l10n/nb_NO/user_webdavauth.po +++ b/l10n/nb_NO/user_webdavauth.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:12+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 16:42+0000\n" +"Last-Translator: espenbye \n" "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgstr "" #: templates/settings.php:4 msgid "URL: http://" -msgstr "" +msgstr "URL: http://" #: templates/settings.php:6 msgid "" diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po index 52bcdb4ed53..1828079d894 100644 --- a/l10n/nl/settings.po +++ b/l10n/nl/settings.po @@ -18,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-20 17:37+0000\n" -"Last-Translator: André Koot \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -171,7 +171,7 @@ msgstr "Download Android Client" msgid "Download iOS Client" msgstr "Download iOS Client" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Wachtwoord" @@ -241,11 +241,11 @@ msgid "" "License\">AGPL." msgstr "Ontwikkeld door de ownCloud gemeenschap, de bron code is gelicenseerd onder de AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Naam" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Groepen" @@ -254,21 +254,29 @@ msgid "Create" msgstr "Creëer" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Standaard limiet" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Andere" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Groep beheerder" -#: templates/users.php:82 -msgid "Quota" -msgstr "Limieten" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "verwijderen" diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po index b62189d236d..d2de08d4a18 100644 --- a/l10n/nn_NO/settings.po +++ b/l10n/nn_NO/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -162,7 +162,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Passord" @@ -232,11 +232,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Namn" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Grupper" @@ -245,21 +245,29 @@ msgid "Create" msgstr "Lag" #: templates/users.php:35 -msgid "Default Quota" +msgid "Default Storage" msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Anna" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "" -#: templates/users.php:82 -msgid "Quota" -msgstr "Kvote" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Slett" diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po index aa5ccaa9439..36b489b83a8 100644 --- a/l10n/oc/settings.po +++ b/l10n/oc/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -161,7 +161,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Senhal" @@ -231,11 +231,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Nom" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Grops" @@ -244,21 +244,29 @@ msgid "Create" msgstr "Crea" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Quota per defaut" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Autres" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Grop Admin" -#: templates/users.php:82 -msgid "Quota" -msgstr "Quota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Escafa" diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po index bd13e836e65..50ee10108d8 100644 --- a/l10n/pl/settings.po +++ b/l10n/pl/settings.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -170,7 +170,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Hasło" @@ -240,11 +240,11 @@ msgid "" "License\">AGPL." msgstr "Stwirzone przez społeczność ownCloud, the kod źródłowy na licencji AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Nazwa" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Grupy" @@ -253,21 +253,29 @@ msgid "Create" msgstr "Utwórz" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Domyślny udział" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Inne" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Grupa Admin" -#: templates/users.php:82 -msgid "Quota" -msgstr "Udział" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Usuń" diff --git a/l10n/pl_PL/settings.po b/l10n/pl_PL/settings.po index f90f3c11162..6a6ddb24fbd 100644 --- a/l10n/pl_PL/settings.po +++ b/l10n/pl_PL/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:11+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -160,7 +160,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "" @@ -230,11 +230,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "" @@ -243,21 +243,29 @@ msgid "Create" msgstr "" #: templates/users.php:35 -msgid "Default Quota" +msgid "Default Storage" msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "" -#: templates/users.php:82 -msgid "Quota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "" diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po index 67cb06fbd6d..912c636340a 100644 --- a/l10n/pt_BR/settings.po +++ b/l10n/pt_BR/settings.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -169,7 +169,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Senha" @@ -239,11 +239,11 @@ msgid "" "License\">AGPL." msgstr "Desenvolvido pela comunidade ownCloud, o código fonte está licenciado sob AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Nome" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Grupos" @@ -252,21 +252,29 @@ msgid "Create" msgstr "Criar" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Quota Padrão" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Outro" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Grupo Administrativo" -#: templates/users.php:82 -msgid "Quota" -msgstr "Cota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Apagar" diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po index eee0eb64fd7..3018d56bd26 100644 --- a/l10n/pt_PT/settings.po +++ b/l10n/pt_PT/settings.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-22 00:24+0100\n" -"PO-Revision-Date: 2012-12-20 23:51+0000\n" -"Last-Translator: Mouxy \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -165,7 +165,7 @@ msgstr "Transferir o cliente android" msgid "Download iOS Client" msgstr "Transferir o cliente iOS" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Palavra-chave" @@ -235,11 +235,11 @@ msgid "" "License\">AGPL." msgstr "Desenvolvido pela comunidade ownCloud, ocódigo fonte está licenciado sob a AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Nome" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Grupos" @@ -248,21 +248,29 @@ msgid "Create" msgstr "Criar" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Quota por padrão" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Outro" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Grupo Administrador" -#: templates/users.php:82 -msgid "Quota" -msgstr "Quota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Apagar" diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po index 98f2a2844e7..1d2ba8f01d2 100644 --- a/l10n/ro/settings.po +++ b/l10n/ro/settings.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -166,7 +166,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Parolă" @@ -236,11 +236,11 @@ msgid "" "License\">AGPL." msgstr "Dezvoltat de the comunitatea ownCloud, codul sursă este licențiat sub AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Nume" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Grupuri" @@ -249,21 +249,29 @@ msgid "Create" msgstr "Crează" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Cotă implicită" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Altele" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Grupul Admin " -#: templates/users.php:82 -msgid "Quota" -msgstr "Cotă" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Șterge" diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po index cfaa71c6af5..81feddae6f4 100644 --- a/l10n/ru/settings.po +++ b/l10n/ru/settings.po @@ -19,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-27 00:04+0100\n" -"PO-Revision-Date: 2012-12-26 06:17+0000\n" -"Last-Translator: adol \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -172,7 +172,7 @@ msgstr "Загрузка Android-приложения" msgid "Download iOS Client" msgstr "Загрузка iOS-приложения" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Пароль" @@ -242,11 +242,11 @@ msgid "" "License\">AGPL." msgstr "Разрабатывается сообществом ownCloud, исходный код доступен под лицензией AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Имя" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Группы" @@ -255,21 +255,29 @@ msgid "Create" msgstr "Создать" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Квота по умолчанию" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Другое" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Группа Администраторы" -#: templates/users.php:82 -msgid "Quota" -msgstr "Квота" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Удалить" diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po index 15f03042ae5..9d013ac07bb 100644 --- a/l10n/ru_RU/settings.po +++ b/l10n/ru_RU/settings.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-22 00:24+0100\n" -"PO-Revision-Date: 2012-12-21 10:00+0000\n" -"Last-Translator: AnnaSch \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -161,7 +161,7 @@ msgstr "Загрузить клиент под Android " msgid "Download iOS Client" msgstr "Загрузить клиент под iOS " -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Пароль" @@ -231,11 +231,11 @@ msgid "" "License\">AGPL." msgstr "Разработанный ownCloud community, the source code is licensed under the AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Имя" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Группы" @@ -244,21 +244,29 @@ msgid "Create" msgstr "Создать" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Квота по умолчанию" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Другой" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Группа Admin" -#: templates/users.php:82 -msgid "Quota" -msgstr "квота" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Удалить" diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po index 6bfa8851760..c6443f18bff 100644 --- a/l10n/si_LK/settings.po +++ b/l10n/si_LK/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -163,7 +163,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "මුරපදය" @@ -233,11 +233,11 @@ msgid "" "License\">AGPL." msgstr "නිපදන ලද්දේ ownCloud සමාජයෙන්, the මුල් කේතය ලයිසන්ස් කර ඇත්තේ AGPL යටතේ." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "නාමය" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "සමූහය" @@ -246,21 +246,29 @@ msgid "Create" msgstr "තනන්න" #: templates/users.php:35 -msgid "Default Quota" -msgstr "සාමාන්‍ය සලාකය" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "වෙනත්" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "කාණ්ඩ පරිපාලක" -#: templates/users.php:82 -msgid "Quota" -msgstr "සලාකය" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "මකා දමනවා" diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po index 7fc980b9834..5f886e918de 100644 --- a/l10n/sk_SK/settings.po +++ b/l10n/sk_SK/settings.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -165,7 +165,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Heslo" @@ -235,11 +235,11 @@ msgid "" "License\">AGPL." msgstr "Vyvinuté komunitou ownCloud,zdrojový kód je licencovaný pod AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Meno" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Skupiny" @@ -248,21 +248,29 @@ msgid "Create" msgstr "Vytvoriť" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Predvolená kvóta" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Iné" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Správca skupiny" -#: templates/users.php:82 -msgid "Quota" -msgstr "Kvóta" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Odstrániť" diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po index 9bf1d7498ab..e10cc61469b 100644 --- a/l10n/sl/settings.po +++ b/l10n/sl/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: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -164,7 +164,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Geslo" @@ -234,11 +234,11 @@ msgid "" "License\">AGPL." msgstr "Programski paket razvija skupnost ownCloud. Izvorna koda je objavljena pod pogoji dovoljenja AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Ime" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Skupine" @@ -247,21 +247,29 @@ msgid "Create" msgstr "Ustvari" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Privzeta količinska omejitev" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Drugo" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Skrbnik skupine" -#: templates/users.php:82 -msgid "Quota" -msgstr "Količinska omejitev" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Izbriši" diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po index d5651cf5325..78be3c6ba44 100644 --- a/l10n/sq/settings.po +++ b/l10n/sq/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:11+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+0000\n" "Last-Translator: I Robot \n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" @@ -160,7 +160,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "" @@ -230,11 +230,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "" @@ -243,21 +243,29 @@ msgid "Create" msgstr "" #: templates/users.php:35 -msgid "Default Quota" +msgid "Default Storage" msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "" -#: templates/users.php:82 -msgid "Quota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "" diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po index e608c443bcc..0a738546bf6 100644 --- a/l10n/sr/settings.po +++ b/l10n/sr/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -162,7 +162,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Лозинка" @@ -232,11 +232,11 @@ msgid "" "License\">AGPL." msgstr "Развијају Оунклауд (ownCloud) заједница, изворни код је издат под АГПЛ лиценцом." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Име" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Групе" @@ -245,21 +245,29 @@ msgid "Create" msgstr "Направи" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Подразумевано ограничење" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Друго" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Управник групе" -#: templates/users.php:82 -msgid "Quota" -msgstr "Ограничење" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Обриши" diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po index 1fa664360e9..0e2ffadb98c 100644 --- a/l10n/sr@latin/settings.po +++ b/l10n/sr@latin/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -161,7 +161,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Lozinka" @@ -231,11 +231,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Ime" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Grupe" @@ -244,21 +244,29 @@ msgid "Create" msgstr "Napravi" #: templates/users.php:35 -msgid "Default Quota" +msgid "Default Storage" msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Drugo" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "" -#: templates/users.php:82 -msgid "Quota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Obriši" diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po index 93565b09c2e..52485e8f6f4 100644 --- a/l10n/sv/settings.po +++ b/l10n/sv/settings.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-26 00:11+0100\n" -"PO-Revision-Date: 2012-12-25 07:58+0000\n" -"Last-Translator: Magnus Höglund \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -167,7 +167,7 @@ msgstr "Ladda ner klient för Android" msgid "Download iOS Client" msgstr "Ladda ner klient för iOS" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Lösenord" @@ -237,11 +237,11 @@ msgid "" "License\">AGPL." msgstr "Utvecklad av ownCloud kommunity, källkoden är licenserad under AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Namn" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Grupper" @@ -250,21 +250,29 @@ msgid "Create" msgstr "Skapa" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Förvald datakvot" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Annat" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Gruppadministratör" -#: templates/users.php:82 -msgid "Quota" -msgstr "Kvot" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Radera" diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po index d06ae0bdd28..4b6d4c45e0e 100644 --- a/l10n/ta_LK/settings.po +++ b/l10n/ta_LK/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -161,7 +161,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "கடவுச்சொல்" @@ -231,11 +231,11 @@ msgid "" "License\">AGPL." msgstr "Developed by the ownCloud community, the source code is licensed under the AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "பெயர்" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "குழுக்கள்" @@ -244,21 +244,29 @@ msgid "Create" msgstr "உருவாக்குக" #: templates/users.php:35 -msgid "Default Quota" -msgstr "பொது இருப்பு பங்கு" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "மற்றவை" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "குழு நிர்வாகி" -#: templates/users.php:82 -msgid "Quota" -msgstr "பங்கு" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "அழிக்க" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 0e7bec058d0..4a7b327861f 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-29 00:07+0100\n" +"POT-Creation-Date: 2012-12-30 00:04+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.pot b/l10n/templates/files.pot index feabdd922b8..bafda267119 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-29 00:07+0100\n" +"POT-Creation-Date: 2012-12-30 00:04+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_encryption.pot b/l10n/templates/files_encryption.pot index ab55d6a46f0..4f497da4a5e 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-29 00:07+0100\n" +"POT-Creation-Date: 2012-12-30 00:04+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 8a8a5ba2b88..616e915131f 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-29 00:07+0100\n" +"POT-Creation-Date: 2012-12-30 00:04+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 71cbe713331..15c8d37ac46 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-29 00:07+0100\n" +"POT-Creation-Date: 2012-12-30 00:04+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_versions.pot b/l10n/templates/files_versions.pot index b4e25ae6229..81d322f1cfc 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-29 00:07+0100\n" +"POT-Creation-Date: 2012-12-30 00:04+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 7c5c44e34b8..2e1e8704e8c 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-29 00:07+0100\n" +"POT-Creation-Date: 2012-12-30 00:04+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 0289d6568d1..9776c97fbb6 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-29 00:07+0100\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -161,7 +161,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "" @@ -230,11 +230,11 @@ msgid "" "General Public License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "" @@ -243,21 +243,29 @@ msgid "Create" msgstr "" #: templates/users.php:35 -msgid "Default Quota" +msgid "Default Storage" msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "" -#: templates/users.php:82 -msgid "Quota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index ed05211033d..38da6d21b9f 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-29 00:07+0100\n" +"POT-Creation-Date: 2012-12-30 00:04+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 96663d5fb4e..9237ed079fb 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-29 00:07+0100\n" +"POT-Creation-Date: 2012-12-30 00:04+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/settings.po b/l10n/th_TH/settings.po index 41350a3882c..27f4a874232 100644 --- a/l10n/th_TH/settings.po +++ b/l10n/th_TH/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -163,7 +163,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "รหัสผ่าน" @@ -233,11 +233,11 @@ msgid "" "License\">AGPL." msgstr "พัฒนาโดย the ชุมชนผู้ใช้งาน ownCloud, the ซอร์สโค้ดอยู่ภายใต้สัญญาอนุญาตของ AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "ชื่อ" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "กลุ่ม" @@ -246,21 +246,29 @@ msgid "Create" msgstr "สร้าง" #: templates/users.php:35 -msgid "Default Quota" -msgstr "โควต้าที่กำหนดไว้เริ่มต้น" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "อื่นๆ" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "ผู้ดูแลกลุ่ม" -#: templates/users.php:82 -msgid "Quota" -msgstr "พื้นที่" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "ลบ" diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po index 424615dce38..cfdb8287d08 100644 --- a/l10n/tr/settings.po +++ b/l10n/tr/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-28 00:20+0100\n" -"PO-Revision-Date: 2012-12-27 11:45+0000\n" -"Last-Translator: Necdet Yücel \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -164,7 +164,7 @@ msgstr "Android İstemcisini İndir" msgid "Download iOS Client" msgstr "iOS İstemcisini İndir" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Parola" @@ -234,11 +234,11 @@ msgid "" "License\">AGPL." msgstr "Geliştirilen TarafownCloud community, the source code is altında lisanslanmıştır AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Ad" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Gruplar" @@ -247,21 +247,29 @@ msgid "Create" msgstr "Oluştur" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Varsayılan Kota" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Diğer" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Yönetici Grubu " -#: templates/users.php:82 -msgid "Quota" -msgstr "Kota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Sil" diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po index 613086e2095..cb8ce3e8cac 100644 --- a/l10n/uk/settings.po +++ b/l10n/uk/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-23 00:09+0100\n" -"PO-Revision-Date: 2012-12-22 02:04+0000\n" -"Last-Translator: volodya327 \n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -163,7 +163,7 @@ msgstr "Завантажити клієнт для Android" msgid "Download iOS Client" msgstr "Завантажити клієнт для iOS" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Пароль" @@ -233,11 +233,11 @@ msgid "" "License\">AGPL." msgstr "Розроблено ownCloud громадою, вихідний код має ліцензію AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Ім'я" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Групи" @@ -246,21 +246,29 @@ msgid "Create" msgstr "Створити" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Квота за замовчуванням" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Інше" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Адміністратор групи" -#: templates/users.php:82 -msgid "Quota" -msgstr "Квота" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Видалити" diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po index e17d6607eed..e8689e484f1 100644 --- a/l10n/vi/settings.po +++ b/l10n/vi/settings.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -166,7 +166,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "Mật khẩu" @@ -236,11 +236,11 @@ msgid "" "License\">AGPL." msgstr "Được phát triển bởi cộng đồng ownCloud, mã nguồn đã được cấp phép theo chuẩn AGPL." -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "Tên" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "Nhóm" @@ -249,21 +249,29 @@ msgid "Create" msgstr "Tạo" #: templates/users.php:35 -msgid "Default Quota" -msgstr "Hạn ngạch mặt định" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "Khác" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "Nhóm quản trị" -#: templates/users.php:82 -msgid "Quota" -msgstr "Hạn ngạch" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "Xóa" diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po index 345bc3af512..2c8e2cabac0 100644 --- a/l10n/zh_CN.GB2312/settings.po +++ b/l10n/zh_CN.GB2312/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -162,7 +162,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "密码" @@ -232,11 +232,11 @@ msgid "" "License\">AGPL." msgstr "由 ownCloud 社区开发，s源代码 以 AGPL 许可协议发布。" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "名字" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "组" @@ -245,21 +245,29 @@ msgid "Create" msgstr "新建" #: templates/users.php:35 -msgid "Default Quota" -msgstr "默认限额" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "其他的" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "群组管理员" -#: templates/users.php:82 -msgid "Quota" -msgstr "限额" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "删除" diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po index 2e39772a758..a28ef198295 100644 --- a/l10n/zh_CN/settings.po +++ b/l10n/zh_CN/settings.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-24 00:11+0100\n" -"PO-Revision-Date: 2012-12-23 13:54+0000\n" -"Last-Translator: Dianjin Wang <1132321739qq@gmail.com>\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -166,7 +166,7 @@ msgstr "下载 Android 客户端" msgid "Download iOS Client" msgstr "下载 iOS 客户端" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "密码" @@ -236,11 +236,11 @@ msgid "" "License\">AGPL." msgstr "由ownCloud社区开发， 源代码在AGPL许可证下发布。" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "名称" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "组" @@ -249,21 +249,29 @@ msgid "Create" msgstr "创建" #: templates/users.php:35 -msgid "Default Quota" -msgstr "默认配额" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "其它" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "组管理员" -#: templates/users.php:82 -msgid "Quota" -msgstr "配额" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "删除" diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po index 5b1f23f900f..0b9bc749d96 100644 --- a/l10n/zh_HK/settings.po +++ b/l10n/zh_HK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:11+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -160,7 +160,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "" @@ -230,11 +230,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "" @@ -243,21 +243,29 @@ msgid "Create" msgstr "" #: templates/users.php:35 -msgid "Default Quota" +msgid "Default Storage" msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "" -#: templates/users.php:82 -msgid "Quota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "" diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po index ca897a2325b..6168a8b0d36 100644 --- a/l10n/zh_TW/settings.po +++ b/l10n/zh_TW/settings.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-21 00:10+0100\n" -"PO-Revision-Date: 2012-12-19 23:20+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+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" @@ -166,7 +166,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "密碼" @@ -236,11 +236,11 @@ msgid "" "License\">AGPL." msgstr "由ownCloud 社區開發，源代碼在AGPL許可證下發布。" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "名稱" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "群組" @@ -249,21 +249,29 @@ msgid "Create" msgstr "創造" #: templates/users.php:35 -msgid "Default Quota" -msgstr "預設容量限制" +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "其他" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "群組 管理員" -#: templates/users.php:82 -msgid "Quota" -msgstr "容量限制" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "刪除" diff --git a/l10n/zu_ZA/settings.po b/l10n/zu_ZA/settings.po index d59859009b5..c8c1d7fb260 100644 --- a/l10n/zu_ZA/settings.po +++ b/l10n/zu_ZA/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:11+0000\n" +"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"PO-Revision-Date: 2012-12-29 23:05+0000\n" "Last-Translator: I Robot \n" "Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n" "MIME-Version: 1.0\n" @@ -160,7 +160,7 @@ msgstr "" msgid "Download iOS Client" msgstr "" -#: templates/personal.php:21 templates/users.php:23 templates/users.php:77 +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" msgstr "" @@ -230,11 +230,11 @@ msgid "" "License\">AGPL." msgstr "" -#: templates/users.php:21 templates/users.php:76 +#: templates/users.php:21 templates/users.php:81 msgid "Name" msgstr "" -#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" msgstr "" @@ -243,21 +243,29 @@ msgid "Create" msgstr "" #: templates/users.php:35 -msgid "Default Quota" +msgid "Default Storage" msgstr "" -#: templates/users.php:55 templates/users.php:138 +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:60 templates/users.php:153 msgid "Other" msgstr "" -#: templates/users.php:80 templates/users.php:112 +#: templates/users.php:85 templates/users.php:117 msgid "Group Admin" msgstr "" -#: templates/users.php:82 -msgid "Quota" +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" msgstr "" -#: templates/users.php:146 +#: templates/users.php:161 msgid "Delete" msgstr "" diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php index b01e0979889..01144672caa 100644 --- a/lib/l10n/nb_NO.php +++ b/lib/l10n/nb_NO.php @@ -16,15 +16,19 @@ "Text" => "Tekst", "Images" => "Bilder", "seconds ago" => "sekunder siden", -"1 minute ago" => "1 minuitt siden", +"1 minute ago" => "1 minutt siden", "%d minutes ago" => "%d minutter siden", +"1 hour ago" => "1 time siden", +"%d hours ago" => "%d timer siden", "today" => "i dag", "yesterday" => "i går", "%d days ago" => "%d dager siden", "last month" => "forrige måned", +"%d months ago" => "%d måneder siden", "last year" => "i fjor", "years ago" => "år siden", "%s is available. Get more information" => "%s er tilgjengelig. Få mer informasjon", "up to date" => "oppdatert", -"updates check is disabled" => "versjonssjekk er avslått" +"updates check is disabled" => "versjonssjekk er avslått", +"Could not find category \"%s\"" => "Kunne ikke finne kategori \"%s\"" ); diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php index 730db722111..d16e6ad10ea 100644 --- a/settings/l10n/ar.php +++ b/settings/l10n/ar.php @@ -53,9 +53,7 @@ "Name" => "الاسم", "Groups" => "مجموعات", "Create" => "انشئ", -"Default Quota" => "الحصة النسبية الإفتراضية", "Other" => "شيء آخر", "Group Admin" => "مدير المجموعة", -"Quota" => "حصه", "Delete" => "حذف" ); diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php index 18784fae7b0..89066d2baa9 100644 --- a/settings/l10n/bg_BG.php +++ b/settings/l10n/bg_BG.php @@ -24,8 +24,6 @@ "Name" => "Име", "Groups" => "Групи", "Create" => "Ново", -"Default Quota" => "Квота по подразбиране", "Other" => "Друго", -"Quota" => "Квота", "Delete" => "Изтриване" ); diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php index 0f57387355a..6a354211254 100644 --- a/settings/l10n/ca.php +++ b/settings/l10n/ca.php @@ -53,9 +53,7 @@ "Name" => "Nom", "Groups" => "Grups", "Create" => "Crea", -"Default Quota" => "Quota per defecte", "Other" => "Altre", "Group Admin" => "Grup Admin", -"Quota" => "Quota", "Delete" => "Suprimeix" ); diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php index c88959026da..a23314a2cc6 100644 --- a/settings/l10n/cs_CZ.php +++ b/settings/l10n/cs_CZ.php @@ -53,9 +53,7 @@ "Name" => "Jméno", "Groups" => "Skupiny", "Create" => "Vytvořit", -"Default Quota" => "Výchozí kvóta", "Other" => "Jiná", "Group Admin" => "Správa skupiny", -"Quota" => "Kvóta", "Delete" => "Smazat" ); diff --git a/settings/l10n/da.php b/settings/l10n/da.php index d8b36266e24..2300b98a2bf 100644 --- a/settings/l10n/da.php +++ b/settings/l10n/da.php @@ -53,9 +53,7 @@ "Name" => "Navn", "Groups" => "Grupper", "Create" => "Ny", -"Default Quota" => "Standard kvote", "Other" => "Andet", "Group Admin" => "Gruppe Administrator", -"Quota" => "Kvote", "Delete" => "Slet" ); diff --git a/settings/l10n/de.php b/settings/l10n/de.php index e27d1c1c432..e54aea3bb99 100644 --- a/settings/l10n/de.php +++ b/settings/l10n/de.php @@ -53,9 +53,7 @@ "Name" => "Name", "Groups" => "Gruppen", "Create" => "Anlegen", -"Default Quota" => "Standard-Quota", "Other" => "Andere", "Group Admin" => "Gruppenadministrator", -"Quota" => "Quota", "Delete" => "Löschen" ); diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php index 99d7c1360ce..7fc439f8222 100644 --- a/settings/l10n/de_DE.php +++ b/settings/l10n/de_DE.php @@ -53,9 +53,7 @@ "Name" => "Name", "Groups" => "Gruppen", "Create" => "Anlegen", -"Default Quota" => "Standard-Quota", "Other" => "Andere", "Group Admin" => "Gruppenadministrator", -"Quota" => "Quota", "Delete" => "Löschen" ); diff --git a/settings/l10n/el.php b/settings/l10n/el.php index 38b96151cb4..1ecd2e269ff 100644 --- a/settings/l10n/el.php +++ b/settings/l10n/el.php @@ -53,9 +53,7 @@ "Name" => "Όνομα", "Groups" => "Ομάδες", "Create" => "Δημιουργία", -"Default Quota" => "Προεπιλεγμένο Όριο", "Other" => "Άλλα", "Group Admin" => "Ομάδα Διαχειριστών", -"Quota" => "Σύνολο Χώρου", "Delete" => "Διαγραφή" ); diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php index 668d48f30b3..4f8d58b1bb7 100644 --- a/settings/l10n/eo.php +++ b/settings/l10n/eo.php @@ -41,9 +41,7 @@ "Name" => "Nomo", "Groups" => "Grupoj", "Create" => "Krei", -"Default Quota" => "Defaŭlta kvoto", "Other" => "Alia", "Group Admin" => "Grupadministranto", -"Quota" => "Kvoto", "Delete" => "Forigi" ); diff --git a/settings/l10n/es.php b/settings/l10n/es.php index 2f7a639ee00..874f5e2a1be 100644 --- a/settings/l10n/es.php +++ b/settings/l10n/es.php @@ -23,8 +23,17 @@ "Select an App" => "Seleccionar una aplicación", "See application page at apps.owncloud.com" => "Echa un vistazo a la web de aplicaciones apps.owncloud.com", "-licensed by " => "-licenciado por ", +"User Documentation" => "Documentación del usuario", +"Administrator Documentation" => "Documentación del adminsitrador", +"Online Documentation" => "Documentación en linea", +"Forum" => "Foro", +"Bugtracker" => "Rastreador de Bugs", +"Commercial Support" => "Soporte Comercial", "You have used %s of the available %s" => "Ha usado %s de %s disponibles", "Clients" => "Clientes", +"Download Desktop Clients" => "Descargar clientes de escritorio", +"Download Android Client" => "Descargar cliente para android", +"Download iOS Client" => "Descargar cliente para iOS", "Password" => "Contraseña", "Your password was changed" => "Su contraseña ha sido cambiada", "Unable to change your password" => "No se ha podido cambiar tu contraseña", @@ -37,13 +46,14 @@ "Fill in an email address to enable password recovery" => "Escribe una dirección de correo electrónico para restablecer la contraseña", "Language" => "Idioma", "Help translate" => "Ayúdanos a traducir", +"WebDAV" => "WebDAV", +"Use this address to connect to your ownCloud in your file manager" => "Use esta dirección para conectarse a su cuenta de ownCloud en el administrador de archivos", +"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.", "Name" => "Nombre", "Groups" => "Grupos", "Create" => "Crear", -"Default Quota" => "Cuota predeterminada", "Other" => "Otro", "Group Admin" => "Grupo admin", -"Quota" => "Cuota", "Delete" => "Eliminar" ); diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php index b408405d6da..b7bd0a22da9 100644 --- a/settings/l10n/es_AR.php +++ b/settings/l10n/es_AR.php @@ -23,8 +23,17 @@ "Select an App" => "Seleccionar una aplicación", "See application page at apps.owncloud.com" => "Mirá la web de aplicaciones apps.owncloud.com", "-licensed by " => "-licenciado por ", +"User Documentation" => "Documentación de Usuario", +"Administrator Documentation" => "Documentación de Administrador", +"Online Documentation" => "Documentación en linea", +"Forum" => "Foro", +"Bugtracker" => "Informar errores", +"Commercial Support" => "Soporte comercial", "You have used %s of the available %s" => "Usaste %s de los %s disponibles", "Clients" => "Clientes", +"Download Desktop Clients" => "Descargar clientes de escritorio", +"Download Android Client" => "Descargar cliente de Android", +"Download iOS Client" => "Descargar cliente de iOS", "Password" => "Contraseña", "Your password was changed" => "Tu contraseña fue cambiada", "Unable to change your password" => "No fue posible cambiar tu contraseña", @@ -37,13 +46,14 @@ "Fill in an email address to enable password recovery" => "Escribí una dirección de correo electrónico para restablecer la contraseña", "Language" => "Idioma", "Help translate" => "Ayudanos a traducir", +"WebDAV" => "WebDAV", +"Use this address to connect to your ownCloud in your file manager" => "Utiliza esta dirección para conectarte con ownCloud en tu Administrador de Archivos", +"Version" => "Versión", "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.", "Name" => "Nombre", "Groups" => "Grupos", "Create" => "Crear", -"Default Quota" => "Cuota predeterminada", "Other" => "Otro", "Group Admin" => "Grupo Administrador", -"Quota" => "Cuota", "Delete" => "Borrar" ); diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php index 7b61ee92eb0..fdf9e35dfe2 100644 --- a/settings/l10n/et_EE.php +++ b/settings/l10n/et_EE.php @@ -38,9 +38,7 @@ "Name" => "Nimi", "Groups" => "Grupid", "Create" => "Lisa", -"Default Quota" => "Vaikimisi kvoot", "Other" => "Muu", "Group Admin" => "Grupi admin", -"Quota" => "Mahupiir", "Delete" => "Kustuta" ); diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php index ee85f723f69..bcf80da33c1 100644 --- a/settings/l10n/eu.php +++ b/settings/l10n/eu.php @@ -53,9 +53,7 @@ "Name" => "Izena", "Groups" => "Taldeak", "Create" => "Sortu", -"Default Quota" => "Kuota lehentsia", "Other" => "Besteak", "Group Admin" => "Talde administradorea", -"Quota" => "Kuota", "Delete" => "Ezabatu" ); diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php index 764bef6dc8b..293a50ff291 100644 --- a/settings/l10n/fa.php +++ b/settings/l10n/fa.php @@ -29,8 +29,6 @@ "Name" => "نام", "Groups" => "گروه ها", "Create" => "ایجاد کردن", -"Default Quota" => "سهم پیش فرض", "Other" => "سایر", -"Quota" => "سهم", "Delete" => "پاک کردن" ); diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php index 2d9d6ce941c..5700f86036f 100644 --- a/settings/l10n/fi_FI.php +++ b/settings/l10n/fi_FI.php @@ -53,9 +53,7 @@ "Name" => "Nimi", "Groups" => "Ryhmät", "Create" => "Luo", -"Default Quota" => "Oletuskiintiö", "Other" => "Muu", "Group Admin" => "Ryhmän ylläpitäjä", -"Quota" => "Kiintiö", "Delete" => "Poista" ); diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php index b4b3d46e05f..3c7f6a43e4d 100644 --- a/settings/l10n/fr.php +++ b/settings/l10n/fr.php @@ -53,9 +53,7 @@ "Name" => "Nom", "Groups" => "Groupes", "Create" => "Créer", -"Default Quota" => "Quota par défaut", "Other" => "Autre", "Group Admin" => "Groupe Admin", -"Quota" => "Quota", "Delete" => "Supprimer" ); diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php index b322c6f8bcf..2853b6fed7d 100644 --- a/settings/l10n/gl.php +++ b/settings/l10n/gl.php @@ -41,9 +41,7 @@ "Name" => "Nome", "Groups" => "Grupos", "Create" => "Crear", -"Default Quota" => "Cota por omisión", "Other" => "Outro", "Group Admin" => "Grupo Admin", -"Quota" => "Cota", "Delete" => "Borrar" ); diff --git a/settings/l10n/he.php b/settings/l10n/he.php index ce9e61be291..1d7a91ee523 100644 --- a/settings/l10n/he.php +++ b/settings/l10n/he.php @@ -51,9 +51,7 @@ "Name" => "שם", "Groups" => "קבוצות", "Create" => "יצירה", -"Default Quota" => "מכסת בררת המחדל", "Other" => "אחר", "Group Admin" => "מנהל הקבוצה", -"Quota" => "מכסה", "Delete" => "מחיקה" ); diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php index 437afeb7f59..b6f7133f13f 100644 --- a/settings/l10n/hr.php +++ b/settings/l10n/hr.php @@ -28,9 +28,7 @@ "Name" => "Ime", "Groups" => "Grupe", "Create" => "Izradi", -"Default Quota" => "standardni kvota", "Other" => "ostali", "Group Admin" => "Grupa Admin", -"Quota" => "kvota", "Delete" => "Obriši" ); diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php index 18f21129b85..124dd4c4eb7 100644 --- a/settings/l10n/hu_HU.php +++ b/settings/l10n/hu_HU.php @@ -1,35 +1,57 @@ "Nem tölthető le a lista az App Store-ból", +"Group already exists" => "A csoport már létezik", +"Unable to add group" => "A csoport nem hozható létre", +"Could not enable app. " => "A program nem aktiválható.", "Email saved" => "Email mentve", "Invalid email" => "Hibás email", "OpenID Changed" => "OpenID megváltozott", "Invalid request" => "Érvénytelen kérés", -"Authentication error" => "Hitelesítési hiba", +"Unable to delete group" => "A csoport nem törölhető", +"Authentication error" => "Azonosítási hiba", +"Unable to delete user" => "A felhasználó nem törölhető", "Language changed" => "A nyelv megváltozott", +"Admins can't remove themself from the admin group" => "Adminisztrátorok nem távolíthatják el magukat az admin csoportból.", +"Unable to add user to group %s" => "A felhasználó nem adható hozzá ehhez a csoporthoz: %s", +"Unable to remove user from group %s" => "A felhasználó nem távolítható el ebből a csoportból: %s", "Disable" => "Letiltás", "Enable" => "Engedélyezés", "Saving..." => "Mentés...", "__language_name__" => "__language_name__", -"Add your App" => "App hozzáadása", -"Select an App" => "Egy App kiválasztása", +"Add your App" => "Az alkalmazás hozzáadása", +"More Apps" => "További alkalmazások", +"Select an App" => "Válasszon egy alkalmazást", "See application page at apps.owncloud.com" => "Lásd apps.owncloud.com, alkalmazások oldal", +"User Documentation" => "Felhasználói leírás", +"Administrator Documentation" => "Üzemeltetői leírás", +"Online Documentation" => "Online leírás", +"Forum" => "Fórum", +"Bugtracker" => "Hibabejelentések", +"Commercial Support" => "Megvásárolható támogatás", +"You have used %s of the available %s" => "Az Ön tárterület-felhasználása jelenleg: %s. Maximálisan ennyi áll rendelkezésére: %s", "Clients" => "Kliensek", +"Download Desktop Clients" => "Desktop kliensprogramok letöltése", +"Download Android Client" => "Android kliens letöltése", +"Download iOS Client" => "iOS kliens letöltése", "Password" => "Jelszó", -"Unable to change your password" => "Nem lehet megváltoztatni a jelszavad", -"Current password" => "Jelenlegi jelszó", -"New password" => "Új jelszó", -"show" => "Mutat", -"Change password" => "Jelszó megváltoztatása", +"Your password was changed" => "A jelszava megváltozott", +"Unable to change your password" => "A jelszó nem változtatható meg", +"Current password" => "A jelenlegi jelszó", +"New password" => "Az új jelszó", +"show" => "lássam", +"Change password" => "A jelszó megváltoztatása", "Email" => "Email", -"Your email address" => "Email címed", -"Fill in an email address to enable password recovery" => "Töltsd ki az email címet, hogy engedélyezhesd a jelszó-visszaállítást", +"Your email address" => "Az Ön emailcíme", +"Fill in an email address to enable password recovery" => "Töltse ki az emailcímet, hogy jelszó-emlékeztetőt kérhessen, ha elfelejtette a jelszavát!", "Language" => "Nyelv", -"Help translate" => "Segíts lefordítani!", +"Help translate" => "Segítsen a fordításban!", +"WebDAV" => "WebDAV elérés: ", +"Use this address to connect to your ownCloud in your file manager" => "Ennek a címnek a megadásával a WebDAV-protokollon keresztül saját gépének fájlkezelőjével is is elérheti az állományait.", +"Version" => "Verzió", "Name" => "Név", "Groups" => "Csoportok", "Create" => "Létrehozás", -"Default Quota" => "Alapértelmezett kvóta", -"Other" => "Egyéb", -"Quota" => "Kvóta", +"Other" => "Más", +"Group Admin" => "Csoportadminisztrátor", "Delete" => "Törlés" ); diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php index f2053b95279..d5057275d2b 100644 --- a/settings/l10n/ia.php +++ b/settings/l10n/ia.php @@ -19,8 +19,6 @@ "Name" => "Nomine", "Groups" => "Gruppos", "Create" => "Crear", -"Default Quota" => "Quota predeterminate", "Other" => "Altere", -"Quota" => "Quota", "Delete" => "Deler" ); diff --git a/settings/l10n/id.php b/settings/l10n/id.php index fd2be4856d9..575b0a233dd 100644 --- a/settings/l10n/id.php +++ b/settings/l10n/id.php @@ -27,9 +27,7 @@ "Name" => "Nama", "Groups" => "Group", "Create" => "Buat", -"Default Quota" => "Kuota default", "Other" => "Lain-lain", "Group Admin" => "Admin Grup", -"Quota" => "Quota", "Delete" => "Hapus" ); diff --git a/settings/l10n/it.php b/settings/l10n/it.php index 79551579fc2..c9717932978 100644 --- a/settings/l10n/it.php +++ b/settings/l10n/it.php @@ -53,9 +53,7 @@ "Name" => "Nome", "Groups" => "Gruppi", "Create" => "Crea", -"Default Quota" => "Quota predefinita", "Other" => "Altro", "Group Admin" => "Gruppo di amministrazione", -"Quota" => "Quote", "Delete" => "Elimina" ); diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php index 847f696037d..29c38827566 100644 --- a/settings/l10n/ja_JP.php +++ b/settings/l10n/ja_JP.php @@ -53,9 +53,7 @@ "Name" => "名前", "Groups" => "グループ", "Create" => "作成", -"Default Quota" => "デフォルトのクォータサイズ", "Other" => "その他", "Group Admin" => "グループ管理者", -"Quota" => "クオータ", "Delete" => "削除" ); diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php index 26720b20619..a9d994f87c6 100644 --- a/settings/l10n/ka_GE.php +++ b/settings/l10n/ka_GE.php @@ -38,9 +38,7 @@ "Name" => "სახელი", "Groups" => "ჯგუფი", "Create" => "შექმნა", -"Default Quota" => "საწყისი ქვოტა", "Other" => "სხვა", "Group Admin" => "ჯგუფის ადმინისტრატორი", -"Quota" => "ქვოტა", "Delete" => "წაშლა" ); diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php index 286cac87c53..6556e1b93b8 100644 --- a/settings/l10n/ko.php +++ b/settings/l10n/ko.php @@ -41,9 +41,7 @@ "Name" => "이름", "Groups" => "그룹", "Create" => "만들기", -"Default Quota" => "기본 할당량", "Other" => "기타", "Group Admin" => "그룹 관리자", -"Quota" => "할당량", "Delete" => "삭제" ); diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php index baa89a033b6..db09bdc1280 100644 --- a/settings/l10n/lb.php +++ b/settings/l10n/lb.php @@ -28,9 +28,7 @@ "Name" => "Numm", "Groups" => "Gruppen", "Create" => "Erstellen", -"Default Quota" => "Standard Quota", "Other" => "Aner", "Group Admin" => "Gruppen Admin", -"Quota" => "Quota", "Delete" => "Läschen" ); diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php index f5fa8e29d96..0430fface00 100644 --- a/settings/l10n/lt_LT.php +++ b/settings/l10n/lt_LT.php @@ -31,8 +31,6 @@ "Name" => "Vardas", "Groups" => "Grupės", "Create" => "Sukurti", -"Default Quota" => "Numatytoji kvota", "Other" => "Kita", -"Quota" => "Limitas", "Delete" => "Ištrinti" ); diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php index 3f45d669b59..5ae9be48e4f 100644 --- a/settings/l10n/lv.php +++ b/settings/l10n/lv.php @@ -39,9 +39,7 @@ "Name" => "Vārds", "Groups" => "Grupas", "Create" => "Izveidot", -"Default Quota" => "Apjoms pēc noklusējuma", "Other" => "Cits", "Group Admin" => "Grupas administrators", -"Quota" => "Apjoms", "Delete" => "Izdzēst" ); diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php index 25a3fa80c47..4c5f7bf549b 100644 --- a/settings/l10n/mk.php +++ b/settings/l10n/mk.php @@ -52,9 +52,7 @@ "Name" => "Име", "Groups" => "Групи", "Create" => "Создај", -"Default Quota" => "Предефинирана квота", "Other" => "Останато", "Group Admin" => "Администратор на група", -"Quota" => "Квота", "Delete" => "Избриши" ); diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php index 608ed7e05d5..27eb4c2df9f 100644 --- a/settings/l10n/ms_MY.php +++ b/settings/l10n/ms_MY.php @@ -27,8 +27,6 @@ "Name" => "Nama", "Groups" => "Kumpulan", "Create" => "Buat", -"Default Quota" => "Kuota Lalai", "Other" => "Lain", -"Quota" => "Kuota", "Delete" => "Padam" ); diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php index 0800b6682e6..24a6085b024 100644 --- a/settings/l10n/nb_NO.php +++ b/settings/l10n/nb_NO.php @@ -21,7 +21,14 @@ "More Apps" => "Flere Apps", "Select an App" => "Velg en app", "See application page at apps.owncloud.com" => "Se applikasjonens side på apps.owncloud.org", +"User Documentation" => "Brukerdokumentasjon", +"Administrator Documentation" => "Administratordokumentasjon", +"Commercial Support" => "Kommersiell støtte", +"You have used %s of the available %s" => "Du har brukt %s av tilgjengelig %s", "Clients" => "Klienter", +"Download Desktop Clients" => "Last ned skrivebordsklienter", +"Download Android Client" => "Last ned Android-klient", +"Download iOS Client" => "Last ned iOS-klient", "Password" => "Passord", "Your password was changed" => "Passord har blitt endret", "Unable to change your password" => "Kunne ikke endre passordet ditt", @@ -34,12 +41,12 @@ "Fill in an email address to enable password recovery" => "Oppi epostadressen du vil tilbakestille passordet for", "Language" => "Språk", "Help translate" => "Bidra til oversettelsen", +"WebDAV" => "WebDAV", +"Version" => "Versjon", "Name" => "Navn", "Groups" => "Grupper", "Create" => "Opprett", -"Default Quota" => "Standard Kvote", "Other" => "Annet", "Group Admin" => "Gruppeadministrator", -"Quota" => "Kvote", "Delete" => "Slett" ); diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php index 40d8742d7b3..583c044ba47 100644 --- a/settings/l10n/nl.php +++ b/settings/l10n/nl.php @@ -53,9 +53,7 @@ "Name" => "Naam", "Groups" => "Groepen", "Create" => "Creëer", -"Default Quota" => "Standaard limiet", "Other" => "Andere", "Group Admin" => "Groep beheerder", -"Quota" => "Limieten", "Delete" => "verwijderen" ); diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php index 92ff6d22df2..9f54fc9ee5f 100644 --- a/settings/l10n/nn_NO.php +++ b/settings/l10n/nn_NO.php @@ -26,6 +26,5 @@ "Groups" => "Grupper", "Create" => "Lag", "Other" => "Anna", -"Quota" => "Kvote", "Delete" => "Slett" ); diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php index 0bed7a9a416..358b44bbec3 100644 --- a/settings/l10n/oc.php +++ b/settings/l10n/oc.php @@ -37,9 +37,7 @@ "Name" => "Nom", "Groups" => "Grops", "Create" => "Crea", -"Default Quota" => "Quota per defaut", "Other" => "Autres", "Group Admin" => "Grop Admin", -"Quota" => "Quota", "Delete" => "Escafa" ); diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php index 3668421d9c7..1008726d36e 100644 --- a/settings/l10n/pl.php +++ b/settings/l10n/pl.php @@ -41,9 +41,7 @@ "Name" => "Nazwa", "Groups" => "Grupy", "Create" => "Utwórz", -"Default Quota" => "Domyślny udział", "Other" => "Inne", "Group Admin" => "Grupa Admin", -"Quota" => "Udział", "Delete" => "Usuń" ); diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php index ebbdc85e45b..a731d142ce3 100644 --- a/settings/l10n/pt_BR.php +++ b/settings/l10n/pt_BR.php @@ -41,9 +41,7 @@ "Name" => "Nome", "Groups" => "Grupos", "Create" => "Criar", -"Default Quota" => "Quota Padrão", "Other" => "Outro", "Group Admin" => "Grupo Administrativo", -"Quota" => "Cota", "Delete" => "Apagar" ); diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php index 6c2a50047db..1cfa991464f 100644 --- a/settings/l10n/pt_PT.php +++ b/settings/l10n/pt_PT.php @@ -53,9 +53,7 @@ "Name" => "Nome", "Groups" => "Grupos", "Create" => "Criar", -"Default Quota" => "Quota por padrão", "Other" => "Outro", "Group Admin" => "Grupo Administrador", -"Quota" => "Quota", "Delete" => "Apagar" ); diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php index 26865c8c711..4c8b1ac420a 100644 --- a/settings/l10n/ro.php +++ b/settings/l10n/ro.php @@ -38,9 +38,7 @@ "Name" => "Nume", "Groups" => "Grupuri", "Create" => "Crează", -"Default Quota" => "Cotă implicită", "Other" => "Altele", "Group Admin" => "Grupul Admin ", -"Quota" => "Cotă", "Delete" => "Șterge" ); diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php index bef330b92b7..48965f9a684 100644 --- a/settings/l10n/ru.php +++ b/settings/l10n/ru.php @@ -48,9 +48,7 @@ "Name" => "Имя", "Groups" => "Группы", "Create" => "Создать", -"Default Quota" => "Квота по умолчанию", "Other" => "Другое", "Group Admin" => "Группа Администраторы", -"Quota" => "Квота", "Delete" => "Удалить" ); diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php index a964fe9166e..38b736a5c18 100644 --- a/settings/l10n/ru_RU.php +++ b/settings/l10n/ru_RU.php @@ -52,9 +52,7 @@ "Name" => "Имя", "Groups" => "Группы", "Create" => "Создать", -"Default Quota" => "Квота по умолчанию", "Other" => "Другой", "Group Admin" => "Группа Admin", -"Quota" => "квота", "Delete" => "Удалить" ); diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php index 6c46834beb1..4f4834921e9 100644 --- a/settings/l10n/si_LK.php +++ b/settings/l10n/si_LK.php @@ -35,9 +35,7 @@ "Name" => "නාමය", "Groups" => "සමූහය", "Create" => "තනන්න", -"Default Quota" => "සාමාන්‍ය සලාකය", "Other" => "වෙනත්", "Group Admin" => "කාණ්ඩ පරිපාලක", -"Quota" => "සලාකය", "Delete" => "මකා දමනවා" ); diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php index 08b9079c3ae..c3cf84f1fe8 100644 --- a/settings/l10n/sk_SK.php +++ b/settings/l10n/sk_SK.php @@ -41,9 +41,7 @@ "Name" => "Meno", "Groups" => "Skupiny", "Create" => "Vytvoriť", -"Default Quota" => "Predvolená kvóta", "Other" => "Iné", "Group Admin" => "Správca skupiny", -"Quota" => "Kvóta", "Delete" => "Odstrániť" ); diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php index 01d1d481b97..ce12b4e3e22 100644 --- a/settings/l10n/sl.php +++ b/settings/l10n/sl.php @@ -41,9 +41,7 @@ "Name" => "Ime", "Groups" => "Skupine", "Create" => "Ustvari", -"Default Quota" => "Privzeta količinska omejitev", "Other" => "Drugo", "Group Admin" => "Skrbnik skupine", -"Quota" => "Količinska omejitev", "Delete" => "Izbriši" ); diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php index be30ab45f53..9fb495a9ebb 100644 --- a/settings/l10n/sr.php +++ b/settings/l10n/sr.php @@ -41,9 +41,7 @@ "Name" => "Име", "Groups" => "Групе", "Create" => "Направи", -"Default Quota" => "Подразумевано ограничење", "Other" => "Друго", "Group Admin" => "Управник групе", -"Quota" => "Ограничење", "Delete" => "Обриши" ); diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php index 15e4bfd035e..bc4ec8c64d7 100644 --- a/settings/l10n/sv.php +++ b/settings/l10n/sv.php @@ -53,9 +53,7 @@ "Name" => "Namn", "Groups" => "Grupper", "Create" => "Skapa", -"Default Quota" => "Förvald datakvot", "Other" => "Annat", "Group Admin" => "Gruppadministratör", -"Quota" => "Kvot", "Delete" => "Radera" ); diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php index cbc2eec8fb7..3b3b1f8dddf 100644 --- a/settings/l10n/ta_LK.php +++ b/settings/l10n/ta_LK.php @@ -40,9 +40,7 @@ "Name" => "பெயர்", "Groups" => "குழுக்கள்", "Create" => "உருவாக்குக", -"Default Quota" => "பொது இருப்பு பங்கு", "Other" => "மற்றவை", "Group Admin" => "குழு நிர்வாகி", -"Quota" => "பங்கு", "Delete" => "அழிக்க" ); diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php index 063ec8733ae..558af48df14 100644 --- a/settings/l10n/th_TH.php +++ b/settings/l10n/th_TH.php @@ -40,9 +40,7 @@ "Name" => "ชื่อ", "Groups" => "กลุ่ม", "Create" => "สร้าง", -"Default Quota" => "โควต้าที่กำหนดไว้เริ่มต้น", "Other" => "อื่นๆ", "Group Admin" => "ผู้ดูแลกลุ่ม", -"Quota" => "พื้นที่", "Delete" => "ลบ" ); diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php index 44dee92a3fc..295dbfab584 100644 --- a/settings/l10n/tr.php +++ b/settings/l10n/tr.php @@ -48,9 +48,7 @@ "Name" => "Ad", "Groups" => "Gruplar", "Create" => "Oluştur", -"Default Quota" => "Varsayılan Kota", "Other" => "Diğer", "Group Admin" => "Yönetici Grubu ", -"Quota" => "Kota", "Delete" => "Sil" ); diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php index b9f48b2e881..d6a9e9fa491 100644 --- a/settings/l10n/uk.php +++ b/settings/l10n/uk.php @@ -53,9 +53,7 @@ "Name" => "Ім'я", "Groups" => "Групи", "Create" => "Створити", -"Default Quota" => "Квота за замовчуванням", "Other" => "Інше", "Group Admin" => "Адміністратор групи", -"Quota" => "Квота", "Delete" => "Видалити" ); diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php index 50259953acd..9651bee1124 100644 --- a/settings/l10n/vi.php +++ b/settings/l10n/vi.php @@ -41,9 +41,7 @@ "Name" => "Tên", "Groups" => "Nhóm", "Create" => "Tạo", -"Default Quota" => "Hạn ngạch mặt định", "Other" => "Khác", "Group Admin" => "Nhóm quản trị", -"Quota" => "Hạn ngạch", "Delete" => "Xóa" ); diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php index cd6610d5a17..6afcc1ecd56 100644 --- a/settings/l10n/zh_CN.GB2312.php +++ b/settings/l10n/zh_CN.GB2312.php @@ -39,9 +39,7 @@ "Name" => "名字", "Groups" => "组", "Create" => "新建", -"Default Quota" => "默认限额", "Other" => "其他的", "Group Admin" => "群组管理员", -"Quota" => "限额", "Delete" => "删除" ); diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php index 99fb0b2279c..00e51d211c4 100644 --- a/settings/l10n/zh_CN.php +++ b/settings/l10n/zh_CN.php @@ -53,9 +53,7 @@ "Name" => "名称", "Groups" => "组", "Create" => "创建", -"Default Quota" => "默认配额", "Other" => "其它", "Group Admin" => "组管理员", -"Quota" => "配额", "Delete" => "删除" ); diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php index 6589973bf99..d25ae4e149c 100644 --- a/settings/l10n/zh_TW.php +++ b/settings/l10n/zh_TW.php @@ -41,9 +41,7 @@ "Name" => "名稱", "Groups" => "群組", "Create" => "創造", -"Default Quota" => "預設容量限制", "Other" => "其他", "Group Admin" => "群組 管理員", -"Quota" => "容量限制", "Delete" => "刪除" ); -- cgit v1.2.3 From 329bddab481129b480ca187b694e507eff7fb125 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Mon, 31 Dec 2012 00:05:31 +0100 Subject: [tx-robot] updated from transifex --- apps/files/l10n/hu_HU.php | 62 ++++++--- apps/files/l10n/is.php | 62 +++++++++ apps/files_encryption/l10n/hu_HU.php | 4 +- apps/files_encryption/l10n/is.php | 6 + apps/files_external/l10n/fr.php | 4 +- apps/files_external/l10n/hu_HU.php | 23 ++- apps/files_external/l10n/is.php | 26 ++++ apps/files_sharing/l10n/hu_HU.php | 8 +- apps/files_sharing/l10n/is.php | 9 ++ apps/files_versions/l10n/hu_HU.php | 8 ++ apps/files_versions/l10n/is.php | 8 ++ apps/user_ldap/l10n/is.php | 5 + apps/user_webdavauth/l10n/hu_HU.php | 4 + apps/user_webdavauth/l10n/is.php | 4 + core/l10n/hu_HU.php | 1 + core/l10n/is.php | 100 +++++++++++++- l10n/cs_CZ/settings.po | 14 +- l10n/de/settings.po | 12 +- l10n/de_DE/settings.po | 12 +- l10n/es/settings.po | 14 +- l10n/es_AR/settings.po | 14 +- l10n/fr/files_external.po | 10 +- l10n/fr/settings.po | 14 +- l10n/hu_HU/core.po | 64 ++++----- l10n/hu_HU/files.po | 160 ++++++++++----------- l10n/hu_HU/files_encryption.po | 22 +-- l10n/hu_HU/files_external.po | 54 ++++---- l10n/hu_HU/files_sharing.po | 18 +-- l10n/hu_HU/files_versions.po | 22 +-- l10n/hu_HU/lib.po | 62 ++++----- l10n/hu_HU/settings.po | 16 +-- l10n/hu_HU/user_webdavauth.po | 10 +- l10n/is/core.po | 261 ++++++++++++++++++----------------- l10n/is/files.po | 199 +++++++++++++------------- l10n/is/files_encryption.po | 23 +-- l10n/is/files_external.po | 61 ++++---- l10n/is/files_sharing.po | 21 +-- l10n/is/files_versions.po | 23 +-- l10n/is/lib.po | 79 +++++------ l10n/is/settings.po | 127 ++++++++--------- l10n/is/user_ldap.po | 13 +- l10n/is/user_webdavauth.po | 11 +- l10n/it/settings.po | 14 +- l10n/sv/settings.po | 15 +- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- lib/l10n/hu_HU.php | 28 ++-- lib/l10n/is.php | 34 +++++ settings/l10n/cs_CZ.php | 4 + settings/l10n/de.php | 4 + settings/l10n/de_DE.php | 4 + settings/l10n/es.php | 4 + settings/l10n/es_AR.php | 4 + settings/l10n/fr.php | 4 + settings/l10n/hu_HU.php | 8 +- settings/l10n/is.php | 62 +++++++++ settings/l10n/it.php | 4 + settings/l10n/sv.php | 4 + 66 files changed, 1155 insertions(+), 728 deletions(-) create mode 100644 apps/files/l10n/is.php create mode 100644 apps/files_encryption/l10n/is.php create mode 100644 apps/files_external/l10n/is.php create mode 100644 apps/files_sharing/l10n/is.php create mode 100644 apps/files_versions/l10n/hu_HU.php create mode 100644 apps/files_versions/l10n/is.php create mode 100644 apps/user_ldap/l10n/is.php create mode 100644 apps/user_webdavauth/l10n/hu_HU.php create mode 100644 apps/user_webdavauth/l10n/is.php create mode 100644 lib/l10n/is.php create mode 100644 settings/l10n/is.php (limited to 'lib') diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php index 083d5a391e1..f797c67b986 100644 --- a/apps/files/l10n/hu_HU.php +++ b/apps/files/l10n/hu_HU.php @@ -1,42 +1,62 @@ "Nincs hiba, a fájl sikeresen feltöltve.", -"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "A feltöltött fájl meghaladja a MAX_FILE_SIZE direktívát ami meghatározott a HTML form-ban.", -"The uploaded file was only partially uploaded" => "Az eredeti fájl csak részlegesen van feltöltve.", -"No file was uploaded" => "Nem lett fájl feltöltve.", -"Missing a temporary folder" => "Hiányzik az ideiglenes könyvtár", -"Failed to write to disk" => "Nem írható lemezre", +"There is no error, the file uploaded with success" => "A fájlt sikerült feltölteni", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "A feltöltött fájl mérete meghaladja a php.ini állományban megadott upload_max_filesize paraméter értékét.", +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "A feltöltött fájl mérete meghaladja a MAX_FILE_SIZE paramétert, ami a HTML formban került megadásra.", +"The uploaded file was only partially uploaded" => "Az eredeti fájlt csak részben sikerült feltölteni.", +"No file was uploaded" => "Nem töltődött fel semmi", +"Missing a temporary folder" => "Hiányzik egy ideiglenes mappa", +"Failed to write to disk" => "Nem sikerült a lemezre történő írás", "Files" => "Fájlok", -"Unshare" => "Nem oszt meg", +"Unshare" => "Megosztás visszavonása", "Delete" => "Törlés", -"replace" => "cserél", +"Rename" => "Átnevezés", +"{new_name} already exists" => "{new_name} már létezik", +"replace" => "írjuk fölül", +"suggest name" => "legyen más neve", "cancel" => "mégse", -"undo" => "visszavon", +"replaced {new_name}" => "a(z) {new_name} állományt kicseréltük", +"undo" => "visszavonás", +"replaced {new_name} with {old_name}" => "{new_name} fájlt kicseréltük ezzel: {old_name}", +"unshared {files}" => "{files} fájl megosztása visszavonva", +"deleted {files}" => "{files} fájl törölve", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'", "generating ZIP-file, it may take some time." => "ZIP-fájl generálása, ez eltarthat egy ideig.", "Unable to upload your file as it is a directory or has 0 bytes" => "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű", "Upload Error" => "Feltöltési hiba", -"Close" => "Bezár", +"Close" => "Bezárás", "Pending" => "Folyamatban", -"Upload cancelled." => "Feltöltés megszakítva", +"1 file uploading" => "1 fájl töltődik föl", +"{count} files uploading" => "{count} fájl töltődik föl", +"Upload cancelled." => "A feltöltést megszakítottuk.", +"File upload is in progress. Leaving the page now will cancel the upload." => "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Érvénytelen mappanév. A \"Shared\" elnevezést az Owncloud rendszer használja.", +"{count} files scanned" => "{count} fájlt találtunk", +"error while scanning" => "Hiba a fájllista-ellenőrzés során", "Name" => "Név", "Size" => "Méret", "Modified" => "Módosítva", +"1 folder" => "1 mappa", +"{count} folders" => "{count} mappa", +"1 file" => "1 fájl", +"{count} files" => "{count} fájl", "File handling" => "Fájlkezelés", "Maximum upload size" => "Maximális feltölthető fájlméret", -"max. possible: " => "max. lehetséges", -"Needed for multi-file and folder downloads." => "Kötegelt file- vagy mappaletöltéshez szükséges", -"Enable ZIP-download" => "ZIP-letöltés engedélyezése", +"max. possible: " => "max. lehetséges: ", +"Needed for multi-file and folder downloads." => "Kötegelt fájl- vagy mappaletöltéshez szükséges", +"Enable ZIP-download" => "A ZIP-letöltés engedélyezése", "0 is unlimited" => "0 = korlátlan", -"Maximum input size for ZIP files" => "ZIP file-ok maximum mérete", +"Maximum input size for ZIP files" => "ZIP-fájlok maximális kiindulási mérete", "Save" => "Mentés", "New" => "Új", "Text file" => "Szövegfájl", "Folder" => "Mappa", +"From link" => "Feltöltés linkről", "Upload" => "Feltöltés", -"Cancel upload" => "Feltöltés megszakítása", -"Nothing in here. Upload something!" => "Töltsön fel egy fájlt.", +"Cancel upload" => "A feltöltés megszakítása", +"Nothing in here. Upload something!" => "Itt nincs semmi. Töltsön fel valamit!", "Download" => "Letöltés", -"Upload too large" => "Feltöltés túl nagy", -"The files you are trying to upload exceed the maximum size for file uploads on this server." => "A fájlokat amit próbálsz feltölteni meghaladta a legnagyobb fájlméretet ezen a szerveren.", -"Files are being scanned, please wait." => "File-ok vizsgálata, kis türelmet", -"Current scanning" => "Aktuális vizsgálat" +"Upload too large" => "A feltöltés túl nagy", +"The files you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.", +"Files are being scanned, please wait." => "A fájllista ellenőrzése zajlik, kis türelmet!", +"Current scanning" => "Ellenőrzés alatt" ); diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php new file mode 100644 index 00000000000..bca878873ac --- /dev/null +++ b/apps/files/l10n/is.php @@ -0,0 +1,62 @@ + "Engin villa, innsending heppnaðist", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Innsend skrá er stærri en upload_max stillingin í php.ini:", +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Innsenda skráin er stærri en MAX_FILE_SIZE sem skilgreint er í HTML sniðinu.", +"The uploaded file was only partially uploaded" => "Einungis hluti af innsendri skrá skilaði sér", +"No file was uploaded" => "Engin skrá skilaði sér", +"Missing a temporary folder" => "Vantar bráðabirgðamöppu", +"Failed to write to disk" => "Tókst ekki að skrifa á disk", +"Files" => "Skrár", +"Unshare" => "Hætta deilingu", +"Delete" => "Eyða", +"Rename" => "Endurskýra", +"{new_name} already exists" => "{new_name} er þegar til", +"replace" => "yfirskrifa", +"suggest name" => "stinga upp á nafni", +"cancel" => "hætta við", +"replaced {new_name}" => "endurskýrði {new_name}", +"undo" => "afturkalla", +"replaced {new_name} with {old_name}" => "yfirskrifaði {new_name} með {old_name}", +"unshared {files}" => "Hætti við deilingu á {files}", +"deleted {files}" => "eyddi {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð.", +"generating ZIP-file, it may take some time." => "bý til ZIP skrá, það gæti tekið smá stund.", +"Unable to upload your file as it is a directory or has 0 bytes" => "Innsending á skrá mistókst, hugsanlega sendir þú möppu eða skráin er 0 bæti.", +"Upload Error" => "Villa við innsendingu", +"Close" => "Loka", +"Pending" => "Bíður", +"1 file uploading" => "1 skrá innsend", +"{count} files uploading" => "{count} skrár innsendar", +"Upload cancelled." => "Hætt við innsendingu.", +"File upload is in progress. Leaving the page now will cancel the upload." => "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Ógilt nafn á möppu. Nafnið \"Shared\" er frátekið fyrir ownCloud.", +"{count} files scanned" => "{count} skrár skimaðar", +"error while scanning" => "villa við skimun", +"Name" => "Nafn", +"Size" => "Stærð", +"Modified" => "Breytt", +"1 folder" => "1 mappa", +"{count} folders" => "{count} möppur", +"1 file" => "1 skrá", +"{count} files" => "{count} skrár", +"File handling" => "Meðhöndlun skrár", +"Maximum upload size" => "Hámarks stærð innsendingar", +"max. possible: " => "hámark mögulegt: ", +"Needed for multi-file and folder downloads." => "Nauðsynlegt til að sækja margar skrár og möppur í einu.", +"Enable ZIP-download" => "Virkja ZIP niðurhal.", +"0 is unlimited" => "0 er ótakmarkað", +"Maximum input size for ZIP files" => "Hámarks inntaksstærð fyrir ZIP skrár", +"Save" => "Vista", +"New" => "Nýtt", +"Text file" => "Texta skrá", +"Folder" => "Mappa", +"From link" => "Af tengli", +"Upload" => "Senda inn", +"Cancel upload" => "Hætta við innsendingu", +"Nothing in here. Upload something!" => "Ekkert hér. Sendu eitthvað inn!", +"Download" => "Niðurhal", +"Upload too large" => "Innsend skrá of stór", +"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni.", +"Files are being scanned, please wait." => "Verið er að skima skrár, vinsamlegast hinkraðu.", +"Current scanning" => "Er að skima" +); diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php index 4352d8b7712..8ea0f731736 100644 --- a/apps/files_encryption/l10n/hu_HU.php +++ b/apps/files_encryption/l10n/hu_HU.php @@ -1,6 +1,6 @@ "Titkosítás", -"Exclude the following file types from encryption" => "A következő fájl típusok kizárása a titkosításból", +"Enable Encryption" => "A titkosítás engedélyezése", "None" => "Egyik sem", -"Enable Encryption" => "Titkosítás engedélyezése" +"Exclude the following file types from encryption" => "A következő fájltípusok kizárása a titkosításból" ); diff --git a/apps/files_encryption/l10n/is.php b/apps/files_encryption/l10n/is.php new file mode 100644 index 00000000000..3210ecb4f8a --- /dev/null +++ b/apps/files_encryption/l10n/is.php @@ -0,0 +1,6 @@ + "Dulkóðun", +"Enable Encryption" => "Virkja dulkóðun", +"None" => "Ekkert", +"Exclude the following file types from encryption" => "Undanskilja eftirfarandi skráartegundir frá dulkóðun" +); diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php index 2c95e0d8b09..0825a961b1c 100644 --- a/apps/files_external/l10n/fr.php +++ b/apps/files_external/l10n/fr.php @@ -5,8 +5,8 @@ "Fill out all required fields" => "Veuillez remplir tous les champs requis", "Please provide a valid Dropbox app key and secret." => "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.", "Error configuring Google Drive storage" => "Erreur lors de la configuration du support de stockage Google Drive", -"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Attention : \"smbclient\" n'est pas installé. Le montage des partages CIFS/SMB n'est pas possible. Contactez votre administrateur système pour l'installer.", -"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." => "Attention : Le support FTP de PHP n'est pas activé ou installé. Le montage des partages FTP n'est pas possible. Contactez votre administrateur système pour l'installer.", +"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Attention : \"smbclient\" n'est pas installé. Le montage des partages CIFS/SMB n'est pas disponible. Contactez votre administrateur système pour l'installer.", +"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." => "Attention : Le support FTP de PHP n'est pas activé ou installé. Le montage des partages FTP n'est pas disponible. Contactez votre administrateur système pour l'installer.", "External Storage" => "Stockage externe", "Mount point" => "Point de montage", "Backend" => "Infrastructure", diff --git a/apps/files_external/l10n/hu_HU.php b/apps/files_external/l10n/hu_HU.php index e915c34b950..b8973c96411 100644 --- a/apps/files_external/l10n/hu_HU.php +++ b/apps/files_external/l10n/hu_HU.php @@ -1,5 +1,26 @@ "Érvényes hozzáférés", +"Error configuring Dropbox storage" => "A Dropbox tárolót nem sikerült beállítani", +"Grant access" => "Megadom a hozzáférést", +"Fill out all required fields" => "Töltse ki az összes szükséges mezőt", +"Please provide a valid Dropbox app key and secret." => "Adjon meg egy érvényes Dropbox app key-t és secretet!", +"Error configuring Google Drive storage" => "A Google Drive tárolót nem sikerült beállítani", +"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Figyelem: az \"smbclient\" nincs telepítve a kiszolgálón. Emiatt nem lehet CIFS/SMB megosztásokat fölcsatolni. Kérje meg a rendszergazdát, hogy telepítse a szükséges programot.", +"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." => "Figyelem: a PHP FTP támogatása vagy nincs telepítve, vagy nincs engedélyezve a kiszolgálón. Emiatt nem lehetséges FTP-tárolókat fölcsatolni. Kérje meg a rendszergazdát, hogy telepítse a szükséges programot.", +"External Storage" => "Külső tárolási szolgáltatások becsatolása", +"Mount point" => "Hova csatoljuk", +"Backend" => "Külső tárolórendszer", +"Configuration" => "Beállítások", +"Options" => "Opciók", +"Applicable" => "Érvényességi kör", +"Add mount point" => "Új csatolás létrehozása", +"None set" => "Nincs beállítva", +"All Users" => "Az összes felhasználó", "Groups" => "Csoportok", "Users" => "Felhasználók", -"Delete" => "Törlés" +"Delete" => "Törlés", +"Enable User External Storage" => "Külső tárolók engedélyezése a felhasználók részére", +"Allow users to mount their own external storage" => "Lehetővé teszi, hogy a felhasználók külső tárolási szolgáltatásokat csatoljanak be a saját területükre", +"SSL root certificates" => "SSL tanúsítványok", +"Import Root Certificate" => "SSL tanúsítványok importálása" ); diff --git a/apps/files_external/l10n/is.php b/apps/files_external/l10n/is.php new file mode 100644 index 00000000000..5110bf5ad27 --- /dev/null +++ b/apps/files_external/l10n/is.php @@ -0,0 +1,26 @@ + "Aðgengi veitt", +"Error configuring Dropbox storage" => "Villa við að setja upp Dropbox gagnasvæði", +"Grant access" => "Veita aðgengi", +"Fill out all required fields" => "Fylltu út alla skilyrta reiti", +"Please provide a valid Dropbox app key and secret." => "Gefðu upp virkan Dropbox lykil og leynikóða", +"Error configuring Google Drive storage" => "Villa kom upp við að setja upp Google Drive gagnasvæði", +"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Aðvörun: \"smbclient\" er ekki uppsettur. Uppsetning á CIFS/SMB gagnasvæðum er ekki möguleg. Hafðu samband við kerfisstjóra til að fá hann uppsettan.", +"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." => "Aðvörun: FTP stuðningur í PHP er ekki virkur. Uppsetning á FTP gagnasvæðum er ekki möguleg. Hafðu samband við kerfisstjóra til að fá hann uppsettan.", +"External Storage" => "Ytri gagnageymsla", +"Mount point" => "Mount svæði", +"Backend" => "Stjórnun", +"Configuration" => "Uppsetning", +"Options" => "Stillingar", +"Applicable" => "Gilt", +"Add mount point" => "Bæta við mount svæði", +"None set" => "Ekkert sett", +"All Users" => "Allir notendur", +"Groups" => "Hópar", +"Users" => "Notendur", +"Delete" => "Eyða", +"Enable User External Storage" => "Virkja ytra gagnasvæði notenda", +"Allow users to mount their own external storage" => "Leyfa notendum að bæta við sínum eigin ytri gagnasvæðum", +"SSL root certificates" => "SSL rótar skilríki", +"Import Root Certificate" => "Flytja inn rótar skilríki" +); diff --git a/apps/files_sharing/l10n/hu_HU.php b/apps/files_sharing/l10n/hu_HU.php index be706461d58..f8ca541260d 100644 --- a/apps/files_sharing/l10n/hu_HU.php +++ b/apps/files_sharing/l10n/hu_HU.php @@ -1,3 +1,9 @@ "Jelszó" +"Password" => "Jelszó", +"Submit" => "Elküld", +"%s shared the folder %s with you" => "%s megosztotta Önnel ezt a mappát: %s", +"%s shared the file %s with you" => "%s megosztotta Önnel ezt az állományt: %s", +"Download" => "Letöltés", +"No preview available for" => "Nem áll rendelkezésre előnézet ehhez: ", +"web services under your control" => "webszolgáltatások saját kézben" ); diff --git a/apps/files_sharing/l10n/is.php b/apps/files_sharing/l10n/is.php new file mode 100644 index 00000000000..bf1975c54ae --- /dev/null +++ b/apps/files_sharing/l10n/is.php @@ -0,0 +1,9 @@ + "Lykilorð", +"Submit" => "Senda", +"%s shared the folder %s with you" => "%s deildi möppunni %s með þér", +"%s shared the file %s with you" => "%s deildi skránni %s með þér", +"Download" => "Niðurhal", +"No preview available for" => "Yfirlit ekki í boði fyrir", +"web services under your control" => "vefþjónusta undir þinni stjórn" +); diff --git a/apps/files_versions/l10n/hu_HU.php b/apps/files_versions/l10n/hu_HU.php new file mode 100644 index 00000000000..1575eda3f35 --- /dev/null +++ b/apps/files_versions/l10n/hu_HU.php @@ -0,0 +1,8 @@ + "Az összes korábbi változat törlése", +"History" => "Korábbi változatok", +"Versions" => "Az állományok korábbi változatai", +"This will delete all existing backup versions of your files" => "Itt törölni tudja állományainak összes korábbi verzióját", +"Files Versioning" => "Az állományok verzionálása", +"Enable" => "engedélyezve" +); diff --git a/apps/files_versions/l10n/is.php b/apps/files_versions/l10n/is.php new file mode 100644 index 00000000000..f63939d3af9 --- /dev/null +++ b/apps/files_versions/l10n/is.php @@ -0,0 +1,8 @@ + "Úrelda allar útgáfur", +"History" => "Saga", +"Versions" => "Útgáfur", +"This will delete all existing backup versions of your files" => "Þetta mun eyða öllum afritum af skránum þínum", +"Files Versioning" => "Útgáfur af skrám", +"Enable" => "Virkja" +); diff --git a/apps/user_ldap/l10n/is.php b/apps/user_ldap/l10n/is.php new file mode 100644 index 00000000000..29bc7692795 --- /dev/null +++ b/apps/user_ldap/l10n/is.php @@ -0,0 +1,5 @@ + "Netþjónn", +"Password" => "Lykilorð", +"Help" => "Hjálp" +); diff --git a/apps/user_webdavauth/l10n/hu_HU.php b/apps/user_webdavauth/l10n/hu_HU.php new file mode 100644 index 00000000000..75a23ed7be4 --- /dev/null +++ b/apps/user_webdavauth/l10n/hu_HU.php @@ -0,0 +1,4 @@ + "URL: http://", +"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "Az ownCloud rendszer erre a címre fogja elküldeni a felhasználók bejelentkezési adatait. Ha 401-es vagy 403-as http kódot kap vissza, azt sikertelen azonosításként fogja értelmezni, minden más kódot sikeresnek fog tekinteni." +); diff --git a/apps/user_webdavauth/l10n/is.php b/apps/user_webdavauth/l10n/is.php new file mode 100644 index 00000000000..13d9a1fe8f4 --- /dev/null +++ b/apps/user_webdavauth/l10n/is.php @@ -0,0 +1,4 @@ + "Vefslóð: http://", +"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud mun senda auðkenni notenda á þessa vefslóð og túkla svörin http 401 og http 403 sem rangar auðkenniupplýsingar og öll önnur svör sem rétt." +); diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php index d1bfb303e6f..9ac326d45ec 100644 --- a/core/l10n/hu_HU.php +++ b/core/l10n/hu_HU.php @@ -5,6 +5,7 @@ "Settings" => "Beállítások", "seconds ago" => "másodperccel ezelőtt", "1 minute ago" => "1 perccel ezelőtt", +"1 hour ago" => "1 órája", "today" => "ma", "yesterday" => "tegnap", "last month" => "múlt hónapban", diff --git a/core/l10n/is.php b/core/l10n/is.php index 23117cddf8b..53b2fe88839 100644 --- a/core/l10n/is.php +++ b/core/l10n/is.php @@ -1,24 +1,110 @@ "Notandinn %s deildi skrá með þér", +"User %s shared a folder with you" => "Notandinn %s deildi möppu með þér", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Notandinn %s deildi skránni \"%s\" með þér. Hægt er að hlaða henni niður hér: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Notandinn %s deildi möppunni \"%s\" með þér. Hægt er að hlaða henni niður hér: %s", "Category type not provided." => "Flokkur ekki gefin", +"No category to add?" => "Enginn flokkur til að bæta við?", +"This category already exists: " => "Þessi flokkur er þegar til:", +"Object type not provided." => "Tegund ekki í boði.", +"%s ID not provided." => "%s ID ekki í boði.", +"Error adding %s to favorites." => "Villa við að bæta %s við eftirlæti.", +"No categories selected for deletion." => "Enginn flokkur valinn til eyðingar.", +"Error removing %s from favorites." => "Villa við að fjarlægja %s úr eftirlæti.", +"Settings" => "Stillingar", "seconds ago" => "sek síðan", "1 minute ago" => "1 min síðan", "{minutes} minutes ago" => "{minutes} min síðan", +"1 hour ago" => "Fyrir 1 klst.", +"{hours} hours ago" => "fyrir {hours} klst.", "today" => "í dag", "yesterday" => "í gær", "{days} days ago" => "{days} dagar síðan", "last month" => "síðasta mánuði", +"{months} months ago" => "fyrir {months} mánuðum", "months ago" => "mánuðir síðan", "last year" => "síðasta ári", "years ago" => "árum síðan", +"Choose" => "Veldu", +"Cancel" => "Hætta við", +"No" => "Nei", +"Yes" => "Já", +"Ok" => "Í lagi", +"The object type is not specified." => "Tegund ekki tilgreind", +"Error" => "Villa", +"The app name is not specified." => "Nafn forrits ekki tilgreint", +"The required file {file} is not installed!" => "Umbeðina skráin {file} ekki tiltæk!", +"Error while sharing" => "Villa við deilingu", +"Error while unsharing" => "Villa við að hætta deilingu", +"Error while changing permissions" => "Villa við að breyta aðgangsheimildum", +"Shared with you and the group {group} by {owner}" => "Deilt með þér og hópnum {group} af {owner}", +"Shared with you by {owner}" => "Deilt með þér af {owner}", +"Share with" => "Deila með", +"Share with link" => "Deila með veftengli", +"Password protect" => "Verja með lykilorði", "Password" => "Lykilorð", +"Email link to person" => "Senda vefhlekk í tölvupóstu til notenda", +"Send" => "Senda", +"Set expiration date" => "Setja gildistíma", +"Expiration date" => "Gildir til", +"Share via email:" => "Deila með tölvupósti:", +"No people found" => "Engir notendur fundust", +"Resharing is not allowed" => "Endurdeiling er ekki leyfð", +"Shared in {item} with {user}" => "Deilt með {item} ásamt {user}", +"Unshare" => "Hætta deilingu", +"can edit" => "getur breytt", +"access control" => "aðgangsstýring", +"create" => "mynda", +"update" => "uppfæra", +"delete" => "eyða", +"share" => "deila", +"Password protected" => "Verja með lykilorði", +"Error unsetting expiration date" => "Villa við að aftengja gildistíma", +"Error setting expiration date" => "Villa við að setja gildistíma", +"Sending ..." => "Sendi ...", +"Email sent" => "Tölvupóstur sendur", +"ownCloud password reset" => "endursetja ownCloud lykilorð", +"Use the following link to reset your password: {link}" => "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}", +"You will receive a link to reset your password via Email." => "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.", +"Reset email send." => "Beiðni um endursetningu send.", +"Request failed!" => "Beiðni mistókst!", "Username" => "Notendanafn", +"Request reset" => "Endursetja lykilorð", +"Your password was reset" => "Lykilorðið þitt hefur verið endursett.", +"To login page" => "Fara á innskráningarsíðu", +"New password" => "Nýtt lykilorð", +"Reset password" => "Endursetja lykilorð", "Personal" => "Persónustillingar", +"Users" => "Notendur", +"Apps" => "Forrit", "Admin" => "Vefstjórn", "Help" => "Help", +"Access forbidden" => "Aðgangur bannaður", "Cloud not found" => "Skýið finnst eigi", "Edit categories" => "Breyta flokkum", "Add" => "Bæta", +"Security Warning" => "Öryggis aðvörun", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Enginn traustur slembitölugjafi í boði, vinsamlegast virkjaðu PHP OpenSSL viðbótina.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Án öruggs slembitölugjafa er mögulegt að sjá fyrir öryggis auðkenni til að endursetja lykilorð og komast inn á aðganginn þinn.", +"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." => "Gagnamappan þín er að öllum líkindum aðgengileg frá internetinu. Skráin .htaccess sem fylgir með ownCloud er ekki að virka. Við mælum eindregið með því að þú stillir vefþjóninn þannig að gagnamappan verði ekki aðgengileg frá internetinu eða færir hana út fyrir vefrótina.", "Create an admin account" => "Útbúa vefstjóra aðgang", +"Advanced" => "Ítarlegt", +"Data folder" => "Gagnamappa", +"Configure the database" => "Stilla gagnagrunn", +"will be used" => "verður notað", +"Database user" => "Notandi gagnagrunns", +"Database password" => "Lykilorð gagnagrunns", +"Database name" => "Nafn gagnagrunns", +"Database tablespace" => "Töflusvæði gagnagrunns", +"Database host" => "Netþjónn gagnagrunns", +"Finish setup" => "Ljúka uppsetningu", +"Sunday" => "Sunnudagur", +"Monday" => "Mánudagur", +"Tuesday" => "Þriðjudagur", +"Wednesday" => "Miðvikudagur", +"Thursday" => "Fimmtudagur", +"Friday" => "Föstudagur", +"Saturday" => "Laugardagur", "January" => "Janúar", "February" => "Febrúar", "March" => "Mars", @@ -29,8 +115,20 @@ "August" => "Ágúst", "September" => "September", "October" => "Október", +"November" => "Nóvember", +"December" => "Desember", +"web services under your control" => "vefþjónusta undir þinni stjórn", "Log out" => "Útskrá", +"Automatic logon rejected!" => "Sjálfvirkri innskráningu hafnað!", +"If you did not change your password recently, your account may be compromised!" => "Ef þú breyttir ekki lykilorðinu þínu fyrir skömmu, er mögulegt að einhver annar hafi komist inn á aðganginn þinn.", +"Please change your password to secure your account again." => "Vinsamlegast breyttu lykilorðinu þínu til að tryggja öryggi þitt.", +"Lost your password?" => "Týndir þú lykilorðinu?", +"remember" => "muna eftir mér", +"Log in" => "Skrá inn", "You are logged out." => "Þú ert útskráð(ur).", "prev" => "fyrra", -"next" => "næsta" +"next" => "næsta", +"Security Warning!" => "Öryggis aðvörun!", +"Please verify your password.
For security reasons you may be occasionally asked to enter your password again." => "Vinsamlegast staðfestu lykilorðið þitt.
Í öryggisskyni munum við biðja þig um að skipta um lykilorð af og til.", +"Verify" => "Staðfesta" ); diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po index d822114feb6..2fd34e04214 100644 --- a/l10n/cs_CZ/settings.po +++ b/l10n/cs_CZ/settings.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" -"PO-Revision-Date: 2012-12-29 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 20:08+0000\n" +"Last-Translator: Tomáš Chvátal \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -250,11 +250,11 @@ msgstr "Vytvořit" #: templates/users.php:35 msgid "Default Storage" -msgstr "" +msgstr "Výchozí úložiště" #: templates/users.php:42 templates/users.php:138 msgid "Unlimited" -msgstr "" +msgstr "Neomezeně" #: templates/users.php:60 templates/users.php:153 msgid "Other" @@ -266,11 +266,11 @@ msgstr "Správa skupiny" #: templates/users.php:87 msgid "Storage" -msgstr "" +msgstr "Úložiště" #: templates/users.php:133 msgid "Default" -msgstr "" +msgstr "Výchozí" #: templates/users.php:161 msgid "Delete" diff --git a/l10n/de/settings.po b/l10n/de/settings.po index 1343f1761fe..129f9393516 100644 --- a/l10n/de/settings.po +++ b/l10n/de/settings.po @@ -24,8 +24,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" -"PO-Revision-Date: 2012-12-29 23:05+0000\n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 00:15+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" @@ -261,11 +261,11 @@ msgstr "Anlegen" #: templates/users.php:35 msgid "Default Storage" -msgstr "" +msgstr "Standard-Speicher" #: templates/users.php:42 templates/users.php:138 msgid "Unlimited" -msgstr "" +msgstr "Unbegrenzt" #: templates/users.php:60 templates/users.php:153 msgid "Other" @@ -277,11 +277,11 @@ msgstr "Gruppenadministrator" #: templates/users.php:87 msgid "Storage" -msgstr "" +msgstr "Speicher" #: templates/users.php:133 msgid "Default" -msgstr "" +msgstr "Standard" #: templates/users.php:161 msgid "Delete" diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index 8e49c577c50..cad62cf5996 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -24,8 +24,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" -"PO-Revision-Date: 2012-12-29 23:05+0000\n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 00:21+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" @@ -261,11 +261,11 @@ msgstr "Anlegen" #: templates/users.php:35 msgid "Default Storage" -msgstr "" +msgstr "Standard-Speicher" #: templates/users.php:42 templates/users.php:138 msgid "Unlimited" -msgstr "" +msgstr "Unbegrenzt" #: templates/users.php:60 templates/users.php:153 msgid "Other" @@ -277,11 +277,11 @@ msgstr "Gruppenadministrator" #: templates/users.php:87 msgid "Storage" -msgstr "" +msgstr "Speicher" #: templates/users.php:133 msgid "Default" -msgstr "" +msgstr "Standard" #: templates/users.php:161 msgid "Delete" diff --git a/l10n/es/settings.po b/l10n/es/settings.po index e6ce79afba7..be3f8676b46 100644 --- a/l10n/es/settings.po +++ b/l10n/es/settings.po @@ -19,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" -"PO-Revision-Date: 2012-12-29 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 00:45+0000\n" +"Last-Translator: Agustin Ferrario \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" @@ -256,11 +256,11 @@ msgstr "Crear" #: templates/users.php:35 msgid "Default Storage" -msgstr "" +msgstr "Almacenamiento Predeterminado" #: templates/users.php:42 templates/users.php:138 msgid "Unlimited" -msgstr "" +msgstr "Ilimitado" #: templates/users.php:60 templates/users.php:153 msgid "Other" @@ -272,11 +272,11 @@ msgstr "Grupo admin" #: templates/users.php:87 msgid "Storage" -msgstr "" +msgstr "Alamacenamiento" #: templates/users.php:133 msgid "Default" -msgstr "" +msgstr "Predeterminado" #: templates/users.php:161 msgid "Delete" diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po index 9946b227e27..5e4d44648a9 100644 --- a/l10n/es_AR/settings.po +++ b/l10n/es_AR/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" -"PO-Revision-Date: 2012-12-29 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 00:45+0000\n" +"Last-Translator: Agustin Ferrario \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" @@ -246,11 +246,11 @@ msgstr "Crear" #: templates/users.php:35 msgid "Default Storage" -msgstr "" +msgstr "Almacenamiento Predeterminado" #: templates/users.php:42 templates/users.php:138 msgid "Unlimited" -msgstr "" +msgstr "Ilimitado" #: templates/users.php:60 templates/users.php:153 msgid "Other" @@ -262,11 +262,11 @@ msgstr "Grupo Administrador" #: templates/users.php:87 msgid "Storage" -msgstr "" +msgstr "Almacenamiento" #: templates/users.php:133 msgid "Default" -msgstr "" +msgstr "Predeterminado" #: templates/users.php:161 msgid "Delete" diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po index a8f3ff32125..02af3bd71fb 100644 --- a/l10n/fr/files_external.po +++ b/l10n/fr/files_external.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-29 00:07+0100\n" -"PO-Revision-Date: 2012-12-28 23:07+0000\n" -"Last-Translator: ouafnico \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 10:41+0000\n" +"Last-Translator: Romain DEP. \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" @@ -47,14 +47,14 @@ msgstr "Erreur lors de la configuration du support de stockage Google Drive" msgid "" "Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." -msgstr "Attention : \"smbclient\" n'est pas installé. Le montage des partages CIFS/SMB n'est pas possible. Contactez votre administrateur système pour l'installer." +msgstr "Attention : \"smbclient\" n'est pas installé. Le montage des partages CIFS/SMB n'est pas disponible. Contactez votre administrateur système pour l'installer." #: lib/config.php:435 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 "Attention : Le support FTP de PHP n'est pas activé ou installé. Le montage des partages FTP n'est pas possible. Contactez votre administrateur système pour l'installer." +msgstr "Attention : Le support FTP de PHP n'est pas activé ou installé. Le montage des partages FTP n'est pas disponible. Contactez votre administrateur système pour l'installer." #: templates/settings.php:3 msgid "External Storage" diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po index 1076e0b9797..2b0461bacab 100644 --- a/l10n/fr/settings.po +++ b/l10n/fr/settings.po @@ -21,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" -"PO-Revision-Date: 2012-12-29 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 11:04+0000\n" +"Last-Translator: Romain DEP. \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" @@ -258,11 +258,11 @@ msgstr "Créer" #: templates/users.php:35 msgid "Default Storage" -msgstr "" +msgstr "Support de stockage par défaut" #: templates/users.php:42 templates/users.php:138 msgid "Unlimited" -msgstr "" +msgstr "Illimité" #: templates/users.php:60 templates/users.php:153 msgid "Other" @@ -274,11 +274,11 @@ msgstr "Groupe Admin" #: templates/users.php:87 msgid "Storage" -msgstr "" +msgstr "Support de stockage" #: templates/users.php:133 msgid "Default" -msgstr "" +msgstr "Défaut" #: templates/users.php:161 msgid "Delete" diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po index be9005b3379..827fa8bff4f 100644 --- a/l10n/hu_HU/core.po +++ b/l10n/hu_HU/core.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-12 23:17+0000\n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 09:40+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" @@ -100,7 +100,7 @@ msgstr "" #: js/js.js:707 msgid "1 hour ago" -msgstr "" +msgstr "1 órája" #: js/js.js:708 msgid "{hours} hours ago" @@ -164,8 +164,8 @@ 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:135 js/share.js:142 js/share.js:541 -#: js/share.js:553 +#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554 +#: js/share.js:566 msgid "Error" msgstr "Hiba" @@ -177,7 +177,7 @@ msgstr "" msgid "The required file {file} is not installed!" msgstr "" -#: js/share.js:124 js/share.js:581 +#: js/share.js:124 js/share.js:594 msgid "Error while sharing" msgstr "" @@ -205,11 +205,11 @@ msgstr "" msgid "Share with link" msgstr "" -#: js/share.js:164 +#: js/share.js:166 msgid "Password protect" msgstr "" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:35 #: templates/verify.php:13 msgid "Password" msgstr "Jelszó" @@ -274,23 +274,23 @@ msgstr "" msgid "share" msgstr "" -#: js/share.js:353 js/share.js:528 js/share.js:530 +#: js/share.js:356 js/share.js:541 msgid "Password protected" msgstr "" -#: js/share.js:541 +#: js/share.js:554 msgid "Error unsetting expiration date" msgstr "" -#: js/share.js:553 +#: js/share.js:566 msgid "Error setting expiration date" msgstr "" -#: js/share.js:568 +#: js/share.js:581 msgid "Sending ..." msgstr "" -#: js/share.js:579 +#: js/share.js:592 msgid "Email sent" msgstr "" @@ -314,8 +314,8 @@ msgstr "" msgid "Request failed!" msgstr "" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:28 msgid "Username" msgstr "Felhasználónév" @@ -404,44 +404,44 @@ msgstr "" msgid "Create an admin account" msgstr "Rendszergazdafiók létrehozása" -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" msgstr "Haladó" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" msgstr "Adatkönyvtár" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" msgstr "Adatbázis konfigurálása" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" msgstr "használva lesz" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" msgstr "Adatbázis felhasználónév" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" msgstr "Adatbázis jelszó" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" msgstr "Adatbázis név" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" msgstr "" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" msgstr "Adatbázis szerver" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" msgstr "Beállítás befejezése" @@ -529,29 +529,29 @@ msgstr "webszolgáltatások az irányításod alatt" msgid "Log out" msgstr "Kilépés" -#: templates/login.php:8 +#: templates/login.php:10 msgid "Automatic logon rejected!" msgstr "" -#: templates/login.php:9 +#: templates/login.php:11 msgid "" "If you did not change your password recently, your account may be " "compromised!" msgstr "" -#: templates/login.php:10 +#: templates/login.php:13 msgid "Please change your password to secure your account again." msgstr "" -#: templates/login.php:15 +#: templates/login.php:19 msgid "Lost your password?" msgstr "Elfelejtett jelszó?" -#: templates/login.php:27 +#: templates/login.php:39 msgid "remember" msgstr "emlékezzen" -#: templates/login.php:28 +#: templates/login.php:41 msgid "Log in" msgstr "Bejelentkezés" diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po index cddd901f078..d430e38083e 100644 --- a/l10n/hu_HU/files.po +++ b/l10n/hu_HU/files.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-01 00:01+0100\n" -"PO-Revision-Date: 2012-11-30 23:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 20:37+0000\n" +"Last-Translator: Laszlo Tornoci \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" @@ -22,169 +22,169 @@ msgstr "" #: ajax/upload.php:20 msgid "There is no error, the file uploaded with success" -msgstr "Nincs hiba, a fájl sikeresen feltöltve." +msgstr "A fájlt sikerült feltölteni" #: ajax/upload.php:21 msgid "" "The uploaded file exceeds the upload_max_filesize directive in php.ini: " -msgstr "" +msgstr "A feltöltött fájl mérete meghaladja a php.ini állományban megadott upload_max_filesize paraméter értékét." #: ajax/upload.php:23 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form" -msgstr "A feltöltött fájl meghaladja a MAX_FILE_SIZE direktívát ami meghatározott a HTML form-ban." +msgstr "A feltöltött fájl mérete meghaladja a MAX_FILE_SIZE paramétert, ami a HTML formban került megadásra." #: ajax/upload.php:25 msgid "The uploaded file was only partially uploaded" -msgstr "Az eredeti fájl csak részlegesen van feltöltve." +msgstr "Az eredeti fájlt csak részben sikerült feltölteni." #: ajax/upload.php:26 msgid "No file was uploaded" -msgstr "Nem lett fájl feltöltve." +msgstr "Nem töltődött fel semmi" #: ajax/upload.php:27 msgid "Missing a temporary folder" -msgstr "Hiányzik az ideiglenes könyvtár" +msgstr "Hiányzik egy ideiglenes mappa" #: ajax/upload.php:28 msgid "Failed to write to disk" -msgstr "Nem írható lemezre" +msgstr "Nem sikerült a lemezre történő írás" #: appinfo/app.php:10 msgid "Files" msgstr "Fájlok" -#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84 +#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85 msgid "Unshare" -msgstr "Nem oszt meg" +msgstr "Megosztás visszavonása" -#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90 +#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91 msgid "Delete" msgstr "Törlés" #: js/fileactions.js:181 msgid "Rename" -msgstr "" +msgstr "Átnevezés" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "{new_name} already exists" -msgstr "" +msgstr "{new_name} már létezik" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "replace" -msgstr "cserél" +msgstr "írjuk fölül" -#: js/filelist.js:201 +#: js/filelist.js:199 msgid "suggest name" -msgstr "" +msgstr "legyen más neve" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "cancel" msgstr "mégse" -#: js/filelist.js:250 +#: js/filelist.js:248 msgid "replaced {new_name}" -msgstr "" +msgstr "a(z) {new_name} állományt kicseréltük" -#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286 +#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284 msgid "undo" -msgstr "visszavon" +msgstr "visszavonás" -#: js/filelist.js:252 +#: js/filelist.js:250 msgid "replaced {new_name} with {old_name}" -msgstr "" +msgstr "{new_name} fájlt kicseréltük ezzel: {old_name}" -#: js/filelist.js:284 +#: js/filelist.js:282 msgid "unshared {files}" -msgstr "" +msgstr "{files} fájl megosztása visszavonva" -#: js/filelist.js:286 +#: js/filelist.js:284 msgid "deleted {files}" -msgstr "" +msgstr "{files} fájl törölve" #: js/files.js:33 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'" -#: js/files.js:183 +#: js/files.js:174 msgid "generating ZIP-file, it may take some time." msgstr "ZIP-fájl generálása, ez eltarthat egy ideig." -#: js/files.js:218 +#: js/files.js:212 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű" -#: js/files.js:218 +#: js/files.js:212 msgid "Upload Error" msgstr "Feltöltési hiba" -#: js/files.js:235 +#: js/files.js:229 msgid "Close" -msgstr "Bezár" +msgstr "Bezárás" -#: js/files.js:254 js/files.js:368 js/files.js:398 +#: js/files.js:248 js/files.js:362 js/files.js:392 msgid "Pending" msgstr "Folyamatban" -#: js/files.js:274 +#: js/files.js:268 msgid "1 file uploading" -msgstr "" +msgstr "1 fájl töltődik föl" -#: js/files.js:277 js/files.js:331 js/files.js:346 +#: js/files.js:271 js/files.js:325 js/files.js:340 msgid "{count} files uploading" -msgstr "" +msgstr "{count} fájl töltődik föl" -#: js/files.js:349 js/files.js:382 +#: js/files.js:343 js/files.js:376 msgid "Upload cancelled." -msgstr "Feltöltés megszakítva" +msgstr "A feltöltést megszakítottuk." -#: js/files.js:451 +#: js/files.js:445 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." -msgstr "" +msgstr "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést." -#: js/files.js:523 +#: js/files.js:515 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" -msgstr "" +msgstr "Érvénytelen mappanév. A \"Shared\" elnevezést az Owncloud rendszer használja." -#: js/files.js:704 +#: js/files.js:699 msgid "{count} files scanned" -msgstr "" +msgstr "{count} fájlt találtunk" -#: js/files.js:712 +#: js/files.js:707 msgid "error while scanning" -msgstr "" +msgstr "Hiba a fájllista-ellenőrzés során" -#: js/files.js:785 templates/index.php:65 +#: js/files.js:780 templates/index.php:66 msgid "Name" msgstr "Név" -#: js/files.js:786 templates/index.php:76 +#: js/files.js:781 templates/index.php:77 msgid "Size" msgstr "Méret" -#: js/files.js:787 templates/index.php:78 +#: js/files.js:782 templates/index.php:79 msgid "Modified" msgstr "Módosítva" -#: js/files.js:814 +#: js/files.js:801 msgid "1 folder" -msgstr "" +msgstr "1 mappa" -#: js/files.js:816 +#: js/files.js:803 msgid "{count} folders" -msgstr "" +msgstr "{count} mappa" -#: js/files.js:824 +#: js/files.js:811 msgid "1 file" -msgstr "" +msgstr "1 fájl" -#: js/files.js:826 +#: js/files.js:813 msgid "{count} files" -msgstr "" +msgstr "{count} fájl" #: templates/admin.php:5 msgid "File handling" @@ -196,15 +196,15 @@ msgstr "Maximális feltölthető fájlméret" #: templates/admin.php:9 msgid "max. possible: " -msgstr "max. lehetséges" +msgstr "max. lehetséges: " #: templates/admin.php:12 msgid "Needed for multi-file and folder downloads." -msgstr "Kötegelt file- vagy mappaletöltéshez szükséges" +msgstr "Kötegelt fájl- vagy mappaletöltéshez szükséges" #: templates/admin.php:14 msgid "Enable ZIP-download" -msgstr "ZIP-letöltés engedélyezése" +msgstr "A ZIP-letöltés engedélyezése" #: templates/admin.php:17 msgid "0 is unlimited" @@ -212,7 +212,7 @@ msgstr "0 = korlátlan" #: templates/admin.php:19 msgid "Maximum input size for ZIP files" -msgstr "ZIP file-ok maximum mérete" +msgstr "ZIP-fájlok maximális kiindulási mérete" #: templates/admin.php:23 msgid "Save" @@ -232,7 +232,7 @@ msgstr "Mappa" #: templates/index.php:14 msgid "From link" -msgstr "" +msgstr "Feltöltés linkről" #: templates/index.php:35 msgid "Upload" @@ -240,30 +240,30 @@ msgstr "Feltöltés" #: templates/index.php:43 msgid "Cancel upload" -msgstr "Feltöltés megszakítása" +msgstr "A feltöltés megszakítása" -#: templates/index.php:57 +#: templates/index.php:58 msgid "Nothing in here. Upload something!" -msgstr "Töltsön fel egy fájlt." +msgstr "Itt nincs semmi. Töltsön fel valamit!" -#: templates/index.php:71 +#: templates/index.php:72 msgid "Download" msgstr "Letöltés" -#: templates/index.php:103 +#: templates/index.php:104 msgid "Upload too large" -msgstr "Feltöltés túl nagy" +msgstr "A feltöltés túl nagy" -#: templates/index.php:105 +#: templates/index.php:106 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." -msgstr "A fájlokat amit próbálsz feltölteni meghaladta a legnagyobb fájlméretet ezen a szerveren." +msgstr "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet." -#: templates/index.php:110 +#: templates/index.php:111 msgid "Files are being scanned, please wait." -msgstr "File-ok vizsgálata, kis türelmet" +msgstr "A fájllista ellenőrzése zajlik, kis türelmet!" -#: templates/index.php:113 +#: templates/index.php:114 msgid "Current scanning" -msgstr "Aktuális vizsgálat" +msgstr "Ellenőrzés alatt" diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po index 8fa556e4714..896e96e2c73 100644 --- a/l10n/hu_HU/files_encryption.po +++ b/l10n/hu_HU/files_encryption.po @@ -8,28 +8,28 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-26 19:46+0200\n" -"PO-Revision-Date: 2012-08-26 09:01+0000\n" -"Last-Translator: Csaba Orban \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 17:43+0000\n" +"Last-Translator: Laszlo Tornoci \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" "Content-Transfer-Encoding: 8bit\n" "Language: hu_HU\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:3 msgid "Encryption" msgstr "Titkosítás" -#: templates/settings.php:4 -msgid "Exclude the following file types from encryption" -msgstr "A következő fájl típusok kizárása a titkosításból" +#: templates/settings.php:6 +msgid "Enable Encryption" +msgstr "A titkosítás engedélyezése" -#: templates/settings.php:5 +#: templates/settings.php:7 msgid "None" msgstr "Egyik sem" -#: templates/settings.php:10 -msgid "Enable Encryption" -msgstr "Titkosítás engedélyezése" +#: templates/settings.php:12 +msgid "Exclude the following file types from encryption" +msgstr "A következő fájltípusok kizárása a titkosításból" diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po index b77194ab265..450c7e05616 100644 --- a/l10n/hu_HU/files_external.po +++ b/l10n/hu_HU/files_external.po @@ -7,9 +7,9 @@ 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: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 19:20+0000\n" +"Last-Translator: Laszlo Tornoci \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" @@ -19,76 +19,76 @@ msgstr "" #: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23 msgid "Access granted" -msgstr "" +msgstr "Érvényes hozzáférés" #: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86 msgid "Error configuring Dropbox storage" -msgstr "" +msgstr "A Dropbox tárolót nem sikerült beállítani" #: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40 msgid "Grant access" -msgstr "" +msgstr "Megadom a hozzáférést" #: js/dropbox.js:73 js/google.js:72 msgid "Fill out all required fields" -msgstr "" +msgstr "Töltse ki az összes szükséges mezőt" #: js/dropbox.js:85 msgid "Please provide a valid Dropbox app key and secret." -msgstr "" +msgstr "Adjon meg egy érvényes Dropbox app key-t és secretet!" #: js/google.js:26 js/google.js:73 js/google.js:78 msgid "Error configuring Google Drive storage" -msgstr "" +msgstr "A Google Drive tárolót nem sikerült beállítani" #: lib/config.php:434 msgid "" "Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Figyelem: az \"smbclient\" nincs telepítve a kiszolgálón. Emiatt nem lehet CIFS/SMB megosztásokat fölcsatolni. Kérje meg a rendszergazdát, hogy telepítse a szükséges programot." #: lib/config.php:435 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 "Figyelem: a PHP FTP támogatása vagy nincs telepítve, vagy nincs engedélyezve a kiszolgálón. Emiatt nem lehetséges FTP-tárolókat fölcsatolni. Kérje meg a rendszergazdát, hogy telepítse a szükséges programot." #: templates/settings.php:3 msgid "External Storage" -msgstr "" +msgstr "Külső tárolási szolgáltatások becsatolása" #: templates/settings.php:8 templates/settings.php:22 msgid "Mount point" -msgstr "" +msgstr "Hova csatoljuk" #: templates/settings.php:9 msgid "Backend" -msgstr "" +msgstr "Külső tárolórendszer" #: templates/settings.php:10 msgid "Configuration" -msgstr "" +msgstr "Beállítások" #: templates/settings.php:11 msgid "Options" -msgstr "" +msgstr "Opciók" #: templates/settings.php:12 msgid "Applicable" -msgstr "" +msgstr "Érvényességi kör" #: templates/settings.php:27 msgid "Add mount point" -msgstr "" +msgstr "Új csatolás létrehozása" #: templates/settings.php:85 msgid "None set" -msgstr "" +msgstr "Nincs beállítva" #: templates/settings.php:86 msgid "All Users" -msgstr "" +msgstr "Az összes felhasználó" #: templates/settings.php:87 msgid "Groups" @@ -99,22 +99,22 @@ msgid "Users" msgstr "Felhasználók" #: 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 "Törlés" #: templates/settings.php:124 msgid "Enable User External Storage" -msgstr "" +msgstr "Külső tárolók engedélyezése a felhasználók részére" #: templates/settings.php:125 msgid "Allow users to mount their own external storage" -msgstr "" +msgstr "Lehetővé teszi, hogy a felhasználók külső tárolási szolgáltatásokat csatoljanak be a saját területükre" -#: templates/settings.php:139 +#: templates/settings.php:136 msgid "SSL root certificates" -msgstr "" +msgstr "SSL tanúsítványok" -#: templates/settings.php:158 +#: templates/settings.php:153 msgid "Import Root Certificate" -msgstr "" +msgstr "SSL tanúsítványok importálása" diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po index 4270813b4c0..0534ea09d43 100644 --- a/l10n/hu_HU/files_sharing.po +++ b/l10n/hu_HU/files_sharing.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" -"PO-Revision-Date: 2012-12-29 17:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 17:39+0000\n" +"Last-Translator: Laszlo Tornoci \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" @@ -24,26 +24,26 @@ msgstr "Jelszó" #: templates/authenticate.php:6 msgid "Submit" -msgstr "" +msgstr "Elküld" #: templates/public.php:17 #, php-format msgid "%s shared the folder %s with you" -msgstr "" +msgstr "%s megosztotta Önnel ezt a mappát: %s" #: templates/public.php:19 #, php-format msgid "%s shared the file %s with you" -msgstr "" +msgstr "%s megosztotta Önnel ezt az állományt: %s" #: templates/public.php:22 templates/public.php:38 msgid "Download" -msgstr "" +msgstr "Letöltés" #: templates/public.php:37 msgid "No preview available for" -msgstr "" +msgstr "Nem áll rendelkezésre előnézet ehhez: " #: templates/public.php:43 msgid "web services under your control" -msgstr "" +msgstr "webszolgáltatások saját kézben" diff --git a/l10n/hu_HU/files_versions.po b/l10n/hu_HU/files_versions.po index b55e474da7f..0a39722ad7f 100644 --- a/l10n/hu_HU/files_versions.po +++ b/l10n/hu_HU/files_versions.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-22 01:14+0200\n" -"PO-Revision-Date: 2012-09-21 23:15+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 17:24+0000\n" +"Last-Translator: Laszlo Tornoci \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" @@ -17,26 +17,26 @@ msgstr "" "Language: hu_HU\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: js/settings-personal.js:31 templates/settings-personal.php:10 +#: js/settings-personal.js:31 templates/settings-personal.php:7 msgid "Expire all versions" -msgstr "" +msgstr "Az összes korábbi változat törlése" #: js/versions.js:16 msgid "History" -msgstr "" +msgstr "Korábbi változatok" #: templates/settings-personal.php:4 msgid "Versions" -msgstr "" +msgstr "Az állományok korábbi változatai" -#: templates/settings-personal.php:7 +#: templates/settings-personal.php:10 msgid "This will delete all existing backup versions of your files" -msgstr "" +msgstr "Itt törölni tudja állományainak összes korábbi verzióját" #: templates/settings.php:3 msgid "Files Versioning" -msgstr "" +msgstr "Az állományok verzionálása" #: templates/settings.php:4 msgid "Enable" -msgstr "" +msgstr "engedélyezve" diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po index 18f4e74d072..1a78f30958a 100644 --- a/l10n/hu_HU/lib.po +++ b/l10n/hu_HU/lib.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-16 00:02+0100\n" -"PO-Revision-Date: 2012-11-14 23:13+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 09:34+0000\n" +"Last-Translator: Laszlo Tornoci \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,45 +18,45 @@ msgstr "" "Language: hu_HU\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:285 +#: app.php:287 msgid "Help" msgstr "Súgó" -#: app.php:292 +#: app.php:294 msgid "Personal" msgstr "Személyes" -#: app.php:297 +#: app.php:299 msgid "Settings" msgstr "Beállítások" -#: app.php:302 +#: app.php:304 msgid "Users" msgstr "Felhasználók" -#: app.php:309 +#: app.php:311 msgid "Apps" msgstr "Alkalmazások" -#: app.php:311 +#: app.php:313 msgid "Admin" msgstr "Admin" -#: files.php:332 +#: files.php:365 msgid "ZIP download is turned off." -msgstr "ZIP-letöltés letiltva" +msgstr "A ZIP-letöltés nem engedélyezett." -#: files.php:333 +#: files.php:366 msgid "Files need to be downloaded one by one." -msgstr "A file-okat egyenként kell letölteni" +msgstr "A fájlokat egyenként kell letölteni" -#: files.php:333 files.php:358 +#: files.php:366 files.php:391 msgid "Back to Files" -msgstr "Vissza a File-okhoz" +msgstr "Vissza a Fájlokhoz" -#: files.php:357 +#: files.php:390 msgid "Selected files too large to generate zip file." -msgstr "Túl nagy file-ok a zip-generáláshoz" +msgstr "A kiválasztott fájlok túl nagy a zip tömörítéshez." #: json.php:28 msgid "Application is not enabled" @@ -68,7 +68,7 @@ msgstr "Hitelesítési hiba" #: json.php:51 msgid "Token expired. Please reload page." -msgstr "A token lejárt. Frissítsd az oldalt." +msgstr "A token lejárt. Frissítse az oldalt." #: search/provider/file.php:17 search/provider/file.php:35 msgid "Files" @@ -80,29 +80,29 @@ msgstr "Szöveg" #: search/provider/file.php:29 msgid "Images" -msgstr "" +msgstr "Képek" #: template.php:103 msgid "seconds ago" -msgstr "másodperccel ezelőtt" +msgstr "másodperce" #: template.php:104 msgid "1 minute ago" -msgstr "1 perccel ezelőtt" +msgstr "1 perce" #: template.php:105 #, php-format msgid "%d minutes ago" -msgstr "%d perccel ezelőtt" +msgstr "%d perce" #: template.php:106 msgid "1 hour ago" -msgstr "" +msgstr "1 órája" #: template.php:107 #, php-format msgid "%d hours ago" -msgstr "" +msgstr "%d órája" #: template.php:108 msgid "today" @@ -115,7 +115,7 @@ msgstr "tegnap" #: template.php:110 #, php-format msgid "%d days ago" -msgstr "%d évvel ezelőtt" +msgstr "%d napja" #: template.php:111 msgid "last month" @@ -124,7 +124,7 @@ msgstr "múlt hónapban" #: template.php:112 #, php-format msgid "%d months ago" -msgstr "" +msgstr "%d hónapja" #: template.php:113 msgid "last year" @@ -132,22 +132,22 @@ msgstr "tavaly" #: template.php:114 msgid "years ago" -msgstr "évvel ezelőtt" +msgstr "éve" #: updater.php:75 #, php-format msgid "%s is available. Get more information" -msgstr "" +msgstr "%s elérhető. További információ." #: updater.php:77 msgid "up to date" -msgstr "" +msgstr "a legfrissebb változat" #: updater.php:80 msgid "updates check is disabled" -msgstr "" +msgstr "A frissitések ellenőrzése nincs engedélyezve." #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" -msgstr "" +msgstr "Ez a kategória nem található: \"%s\"" diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po index c1f721a18a4..b00e728cc43 100644 --- a/l10n/hu_HU/settings.po +++ b/l10n/hu_HU/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" -"PO-Revision-Date: 2012-12-29 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 14:17+0000\n" +"Last-Translator: Laszlo Tornoci \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" @@ -115,7 +115,7 @@ msgstr "Lásd apps.owncloud.com, alkalmazások oldal" #: templates/apps.php:32 msgid "-licensed by " -msgstr "" +msgstr "-a jogtuladonos " #: templates/help.php:3 msgid "User Documentation" @@ -196,11 +196,11 @@ msgstr "Email" #: templates/personal.php:34 msgid "Your email address" -msgstr "Az Ön emailcíme" +msgstr "Az Ön email címe" #: templates/personal.php:35 msgid "Fill in an email address to enable password recovery" -msgstr "Töltse ki az emailcímet, hogy jelszó-emlékeztetőt kérhessen, ha elfelejtette a jelszavát!" +msgstr "Adja meg az email címét, hogy jelszó-emlékeztetőt kérhessen, ha elfelejtette a jelszavát!" #: templates/personal.php:41 templates/personal.php:42 msgid "Language" @@ -212,7 +212,7 @@ msgstr "Segítsen a fordításban!" #: templates/personal.php:52 msgid "WebDAV" -msgstr "WebDAV elérés: " +msgstr "WebDAV" #: templates/personal.php:54 msgid "Use this address to connect to your ownCloud in your file manager" @@ -230,7 +230,7 @@ msgid "" "licensed under the AGPL." -msgstr "" +msgstr "A programot az ownCloud közösség fejleszti. A forráskód az AGPL feltételei mellett használható föl." #: templates/users.php:21 templates/users.php:81 msgid "Name" diff --git a/l10n/hu_HU/user_webdavauth.po b/l10n/hu_HU/user_webdavauth.po index 5b8d806958e..5d89219034f 100644 --- a/l10n/hu_HU/user_webdavauth.po +++ b/l10n/hu_HU/user_webdavauth.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:12+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 20:47+0000\n" +"Last-Translator: Laszlo Tornoci \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" @@ -19,11 +19,11 @@ msgstr "" #: templates/settings.php:4 msgid "URL: http://" -msgstr "" +msgstr "URL: http://" #: templates/settings.php:6 msgid "" "ownCloud will send the user credentials to this URL is interpret http 401 " "and http 403 as credentials wrong and all other codes as credentials " "correct." -msgstr "" +msgstr "Az ownCloud rendszer erre a címre fogja elküldeni a felhasználók bejelentkezési adatait. Ha 401-es vagy 403-as http kódot kap vissza, azt sikertelen azonosításként fogja értelmezni, minden más kódot sikeresnek fog tekinteni." diff --git a/l10n/is/core.po b/l10n/is/core.po index 4432000b3cc..f21c418fab2 100644 --- a/l10n/is/core.po +++ b/l10n/is/core.po @@ -4,13 +4,14 @@ # # Translators: # , 2012. +# , 2012. 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-12 23:17+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 14:48+0000\n" +"Last-Translator: sveinn \n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,26 +22,26 @@ msgstr "" #: ajax/share.php:84 #, php-format msgid "User %s shared a file with you" -msgstr "" +msgstr "Notandinn %s deildi skrá með þér" #: ajax/share.php:86 #, php-format msgid "User %s shared a folder with you" -msgstr "" +msgstr "Notandinn %s deildi möppu með þér" #: ajax/share.php:88 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" -msgstr "" +msgstr "Notandinn %s deildi skránni \"%s\" með þér. Hægt er að hlaða henni niður hér: %s" #: ajax/share.php:90 #, php-format msgid "" "User %s shared the folder \"%s\" with you. It is available for download " "here: %s" -msgstr "" +msgstr "Notandinn %s deildi möppunni \"%s\" með þér. Hægt er að hlaða henni niður hér: %s" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -48,41 +49,41 @@ msgstr "Flokkur ekki gefin" #: ajax/vcategories/add.php:30 msgid "No category to add?" -msgstr "" +msgstr "Enginn flokkur til að bæta við?" #: ajax/vcategories/add.php:37 msgid "This category already exists: " -msgstr "" +msgstr "Þessi flokkur er þegar til:" #: 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 "" +msgstr "Tegund ekki í boði." #: ajax/vcategories/addToFavorites.php:30 #: ajax/vcategories/removeFromFavorites.php:30 #, php-format msgid "%s ID not provided." -msgstr "" +msgstr "%s ID ekki í boði." #: ajax/vcategories/addToFavorites.php:35 #, php-format msgid "Error adding %s to favorites." -msgstr "" +msgstr "Villa við að bæta %s við eftirlæti." #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 msgid "No categories selected for deletion." -msgstr "" +msgstr "Enginn flokkur valinn til eyðingar." #: ajax/vcategories/removeFromFavorites.php:35 #, php-format msgid "Error removing %s from favorites." -msgstr "" +msgstr "Villa við að fjarlægja %s úr eftirlæti." #: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61 msgid "Settings" -msgstr "" +msgstr "Stillingar" #: js/js.js:704 msgid "seconds ago" @@ -98,11 +99,11 @@ msgstr "{minutes} min síðan" #: js/js.js:707 msgid "1 hour ago" -msgstr "" +msgstr "Fyrir 1 klst." #: js/js.js:708 msgid "{hours} hours ago" -msgstr "" +msgstr "fyrir {hours} klst." #: js/js.js:709 msgid "today" @@ -122,7 +123,7 @@ msgstr "síðasta mánuði" #: js/js.js:713 msgid "{months} months ago" -msgstr "" +msgstr "fyrir {months} mánuðum" #: js/js.js:714 msgid "months ago" @@ -138,204 +139,204 @@ msgstr "árum síðan" #: js/oc-dialogs.js:126 msgid "Choose" -msgstr "" +msgstr "Veldu" #: js/oc-dialogs.js:146 js/oc-dialogs.js:166 msgid "Cancel" -msgstr "" +msgstr "Hætta við" #: js/oc-dialogs.js:162 msgid "No" -msgstr "" +msgstr "Nei" #: js/oc-dialogs.js:163 msgid "Yes" -msgstr "" +msgstr "Já" #: js/oc-dialogs.js:180 msgid "Ok" -msgstr "" +msgstr "Í lagi" #: 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 "" +msgstr "Tegund ekki tilgreind" #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 -#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541 -#: js/share.js:553 +#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554 +#: js/share.js:566 msgid "Error" -msgstr "" +msgstr "Villa" #: js/oc-vcategories.js:179 msgid "The app name is not specified." -msgstr "" +msgstr "Nafn forrits ekki tilgreint" #: js/oc-vcategories.js:194 msgid "The required file {file} is not installed!" -msgstr "" +msgstr "Umbeðina skráin {file} ekki tiltæk!" -#: js/share.js:124 js/share.js:581 +#: js/share.js:124 js/share.js:594 msgid "Error while sharing" -msgstr "" +msgstr "Villa við deilingu" #: js/share.js:135 msgid "Error while unsharing" -msgstr "" +msgstr "Villa við að hætta deilingu" #: js/share.js:142 msgid "Error while changing permissions" -msgstr "" +msgstr "Villa við að breyta aðgangsheimildum" #: js/share.js:151 msgid "Shared with you and the group {group} by {owner}" -msgstr "" +msgstr "Deilt með þér og hópnum {group} af {owner}" #: js/share.js:153 msgid "Shared with you by {owner}" -msgstr "" +msgstr "Deilt með þér af {owner}" #: js/share.js:158 msgid "Share with" -msgstr "" +msgstr "Deila með" #: js/share.js:163 msgid "Share with link" -msgstr "" +msgstr "Deila með veftengli" -#: js/share.js:164 +#: js/share.js:166 msgid "Password protect" -msgstr "" +msgstr "Verja með lykilorði" -#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: js/share.js:168 templates/installation.php:44 templates/login.php:35 #: templates/verify.php:13 msgid "Password" msgstr "Lykilorð" #: js/share.js:172 msgid "Email link to person" -msgstr "" +msgstr "Senda vefhlekk í tölvupóstu til notenda" #: js/share.js:173 msgid "Send" -msgstr "" +msgstr "Senda" #: js/share.js:177 msgid "Set expiration date" -msgstr "" +msgstr "Setja gildistíma" #: js/share.js:178 msgid "Expiration date" -msgstr "" +msgstr "Gildir til" #: js/share.js:210 msgid "Share via email:" -msgstr "" +msgstr "Deila með tölvupósti:" #: js/share.js:212 msgid "No people found" -msgstr "" +msgstr "Engir notendur fundust" #: js/share.js:239 msgid "Resharing is not allowed" -msgstr "" +msgstr "Endurdeiling er ekki leyfð" #: js/share.js:275 msgid "Shared in {item} with {user}" -msgstr "" +msgstr "Deilt með {item} ásamt {user}" #: js/share.js:296 msgid "Unshare" -msgstr "" +msgstr "Hætta deilingu" #: js/share.js:308 msgid "can edit" -msgstr "" +msgstr "getur breytt" #: js/share.js:310 msgid "access control" -msgstr "" +msgstr "aðgangsstýring" #: js/share.js:313 msgid "create" -msgstr "" +msgstr "mynda" #: js/share.js:316 msgid "update" -msgstr "" +msgstr "uppfæra" #: js/share.js:319 msgid "delete" -msgstr "" +msgstr "eyða" #: js/share.js:322 msgid "share" -msgstr "" +msgstr "deila" -#: js/share.js:353 js/share.js:528 js/share.js:530 +#: js/share.js:356 js/share.js:541 msgid "Password protected" -msgstr "" +msgstr "Verja með lykilorði" -#: js/share.js:541 +#: js/share.js:554 msgid "Error unsetting expiration date" -msgstr "" +msgstr "Villa við að aftengja gildistíma" -#: js/share.js:553 +#: js/share.js:566 msgid "Error setting expiration date" -msgstr "" +msgstr "Villa við að setja gildistíma" -#: js/share.js:568 +#: js/share.js:581 msgid "Sending ..." -msgstr "" +msgstr "Sendi ..." -#: js/share.js:579 +#: js/share.js:592 msgid "Email sent" -msgstr "" +msgstr "Tölvupóstur sendur" #: lostpassword/controller.php:47 msgid "ownCloud password reset" -msgstr "" +msgstr "endursetja ownCloud lykilorð" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" -msgstr "" +msgstr "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}" #: lostpassword/templates/lostpassword.php:3 msgid "You will receive a link to reset your password via Email." -msgstr "" +msgstr "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið." #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "Beiðni um endursetningu send." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "Beiðni mistókst!" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 -#: templates/login.php:20 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: templates/login.php:28 msgid "Username" msgstr "Notendanafn" #: lostpassword/templates/lostpassword.php:14 msgid "Request reset" -msgstr "" +msgstr "Endursetja lykilorð" #: lostpassword/templates/resetpassword.php:4 msgid "Your password was reset" -msgstr "" +msgstr "Lykilorðið þitt hefur verið endursett." #: lostpassword/templates/resetpassword.php:5 msgid "To login page" -msgstr "" +msgstr "Fara á innskráningarsíðu" #: lostpassword/templates/resetpassword.php:8 msgid "New password" -msgstr "" +msgstr "Nýtt lykilorð" #: lostpassword/templates/resetpassword.php:11 msgid "Reset password" -msgstr "" +msgstr "Endursetja lykilorð" #: strings.php:5 msgid "Personal" @@ -343,11 +344,11 @@ msgstr "Persónustillingar" #: strings.php:6 msgid "Users" -msgstr "" +msgstr "Notendur" #: strings.php:7 msgid "Apps" -msgstr "" +msgstr "Forrit" #: strings.php:8 msgid "Admin" @@ -359,7 +360,7 @@ msgstr "Help" #: templates/403.php:12 msgid "Access forbidden" -msgstr "" +msgstr "Aðgangur bannaður" #: templates/404.php:12 msgid "Cloud not found" @@ -375,19 +376,19 @@ msgstr "Bæta" #: templates/installation.php:23 templates/installation.php:31 msgid "Security Warning" -msgstr "" +msgstr "Öryggis aðvörun" #: templates/installation.php:24 msgid "" "No secure random number generator is available, please enable the PHP " "OpenSSL extension." -msgstr "" +msgstr "Enginn traustur slembitölugjafi í boði, vinsamlegast virkjaðu PHP OpenSSL viðbótina." #: templates/installation.php:26 msgid "" "Without a secure random number generator an attacker may be able to predict " "password reset tokens and take over your account." -msgstr "" +msgstr "Án öruggs slembitölugjafa er mögulegt að sjá fyrir öryggis auðkenni til að endursetja lykilorð og komast inn á aðganginn þinn." #: templates/installation.php:32 msgid "" @@ -396,80 +397,80 @@ 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 "" +msgstr "Gagnamappan þín er að öllum líkindum aðgengileg frá internetinu. Skráin .htaccess sem fylgir með ownCloud er ekki að virka. Við mælum eindregið með því að þú stillir vefþjóninn þannig að gagnamappan verði ekki aðgengileg frá internetinu eða færir hana út fyrir vefrótina." #: templates/installation.php:36 msgid "Create an admin account" msgstr "Útbúa vefstjóra aðgang" -#: templates/installation.php:48 +#: templates/installation.php:50 msgid "Advanced" -msgstr "" +msgstr "Ítarlegt" -#: templates/installation.php:50 +#: templates/installation.php:52 msgid "Data folder" -msgstr "" +msgstr "Gagnamappa" -#: templates/installation.php:57 +#: templates/installation.php:59 msgid "Configure the database" -msgstr "" +msgstr "Stilla gagnagrunn" -#: templates/installation.php:62 templates/installation.php:73 -#: templates/installation.php:83 templates/installation.php:93 +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 msgid "will be used" -msgstr "" +msgstr "verður notað" -#: templates/installation.php:105 +#: templates/installation.php:107 msgid "Database user" -msgstr "" +msgstr "Notandi gagnagrunns" -#: templates/installation.php:109 +#: templates/installation.php:111 msgid "Database password" -msgstr "" +msgstr "Lykilorð gagnagrunns" -#: templates/installation.php:113 +#: templates/installation.php:115 msgid "Database name" -msgstr "" +msgstr "Nafn gagnagrunns" -#: templates/installation.php:121 +#: templates/installation.php:123 msgid "Database tablespace" -msgstr "" +msgstr "Töflusvæði gagnagrunns" -#: templates/installation.php:127 +#: templates/installation.php:129 msgid "Database host" -msgstr "" +msgstr "Netþjónn gagnagrunns" -#: templates/installation.php:132 +#: templates/installation.php:134 msgid "Finish setup" -msgstr "" +msgstr "Ljúka uppsetningu" #: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Sunday" -msgstr "" +msgstr "Sunnudagur" #: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Monday" -msgstr "" +msgstr "Mánudagur" #: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Tuesday" -msgstr "" +msgstr "Þriðjudagur" #: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Wednesday" -msgstr "" +msgstr "Miðvikudagur" #: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Thursday" -msgstr "" +msgstr "Fimmtudagur" #: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Friday" -msgstr "" +msgstr "Föstudagur" #: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Saturday" -msgstr "" +msgstr "Laugardagur" #: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "January" @@ -513,45 +514,45 @@ msgstr "Október" #: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "November" -msgstr "" +msgstr "Nóvember" #: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "December" -msgstr "" +msgstr "Desember" #: templates/layout.guest.php:42 msgid "web services under your control" -msgstr "" +msgstr "vefþjónusta undir þinni stjórn" #: templates/layout.user.php:45 msgid "Log out" msgstr "Útskrá" -#: templates/login.php:8 +#: templates/login.php:10 msgid "Automatic logon rejected!" -msgstr "" +msgstr "Sjálfvirkri innskráningu hafnað!" -#: templates/login.php:9 +#: templates/login.php:11 msgid "" "If you did not change your password recently, your account may be " "compromised!" -msgstr "" +msgstr "Ef þú breyttir ekki lykilorðinu þínu fyrir skömmu, er mögulegt að einhver annar hafi komist inn á aðganginn þinn." -#: templates/login.php:10 +#: templates/login.php:13 msgid "Please change your password to secure your account again." -msgstr "" +msgstr "Vinsamlegast breyttu lykilorðinu þínu til að tryggja öryggi þitt." -#: templates/login.php:15 +#: templates/login.php:19 msgid "Lost your password?" -msgstr "" +msgstr "Týndir þú lykilorðinu?" -#: templates/login.php:27 +#: templates/login.php:39 msgid "remember" -msgstr "" +msgstr "muna eftir mér" -#: templates/login.php:28 +#: templates/login.php:41 msgid "Log in" -msgstr "" +msgstr "Skrá inn" #: templates/logout.php:1 msgid "You are logged out." @@ -567,14 +568,14 @@ msgstr "næsta" #: templates/verify.php:5 msgid "Security Warning!" -msgstr "" +msgstr "Öryggis aðvörun!" #: templates/verify.php:6 msgid "" "Please verify your password.
For security reasons you may be " "occasionally asked to enter your password again." -msgstr "" +msgstr "Vinsamlegast staðfestu lykilorðið þitt.
Í öryggisskyni munum við biðja þig um að skipta um lykilorð af og til." #: templates/verify.php:16 msgid "Verify" -msgstr "" +msgstr "Staðfesta" diff --git a/l10n/is/files.po b/l10n/is/files.po index 094b80b04e4..1036913c086 100644 --- a/l10n/is/files.po +++ b/l10n/is/files.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-06 00:11+0100\n" -"PO-Revision-Date: 2011-08-13 02:19+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 15:06+0000\n" +"Last-Translator: sveinn \n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,248 +20,248 @@ msgstr "" #: ajax/upload.php:20 msgid "There is no error, the file uploaded with success" -msgstr "" +msgstr "Engin villa, innsending heppnaðist" #: ajax/upload.php:21 msgid "" "The uploaded file exceeds the upload_max_filesize directive in php.ini: " -msgstr "" +msgstr "Innsend skrá er stærri en upload_max stillingin í php.ini:" #: ajax/upload.php:23 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form" -msgstr "" +msgstr "Innsenda skráin er stærri en MAX_FILE_SIZE sem skilgreint er í HTML sniðinu." #: ajax/upload.php:25 msgid "The uploaded file was only partially uploaded" -msgstr "" +msgstr "Einungis hluti af innsendri skrá skilaði sér" #: ajax/upload.php:26 msgid "No file was uploaded" -msgstr "" +msgstr "Engin skrá skilaði sér" #: ajax/upload.php:27 msgid "Missing a temporary folder" -msgstr "" +msgstr "Vantar bráðabirgðamöppu" #: ajax/upload.php:28 msgid "Failed to write to disk" -msgstr "" +msgstr "Tókst ekki að skrifa á disk" #: appinfo/app.php:10 msgid "Files" -msgstr "" +msgstr "Skrár" -#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84 +#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85 msgid "Unshare" -msgstr "" +msgstr "Hætta deilingu" -#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90 +#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91 msgid "Delete" -msgstr "" +msgstr "Eyða" #: js/fileactions.js:181 msgid "Rename" -msgstr "" +msgstr "Endurskýra" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "{new_name} already exists" -msgstr "" +msgstr "{new_name} er þegar til" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "replace" -msgstr "" +msgstr "yfirskrifa" -#: js/filelist.js:201 +#: js/filelist.js:199 msgid "suggest name" -msgstr "" +msgstr "stinga upp á nafni" -#: js/filelist.js:201 js/filelist.js:203 +#: js/filelist.js:199 js/filelist.js:201 msgid "cancel" -msgstr "" +msgstr "hætta við" -#: js/filelist.js:250 +#: js/filelist.js:248 msgid "replaced {new_name}" -msgstr "" +msgstr "endurskýrði {new_name}" -#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286 +#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284 msgid "undo" -msgstr "" +msgstr "afturkalla" -#: js/filelist.js:252 +#: js/filelist.js:250 msgid "replaced {new_name} with {old_name}" -msgstr "" +msgstr "yfirskrifaði {new_name} með {old_name}" -#: js/filelist.js:284 +#: js/filelist.js:282 msgid "unshared {files}" -msgstr "" +msgstr "Hætti við deilingu á {files}" -#: js/filelist.js:286 +#: js/filelist.js:284 msgid "deleted {files}" -msgstr "" +msgstr "eyddi {files}" #: js/files.js:33 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð." -#: js/files.js:183 +#: js/files.js:174 msgid "generating ZIP-file, it may take some time." -msgstr "" +msgstr "bý til ZIP skrá, það gæti tekið smá stund." -#: js/files.js:218 +#: js/files.js:212 msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "" +msgstr "Innsending á skrá mistókst, hugsanlega sendir þú möppu eða skráin er 0 bæti." -#: js/files.js:218 +#: js/files.js:212 msgid "Upload Error" -msgstr "" +msgstr "Villa við innsendingu" -#: js/files.js:235 +#: js/files.js:229 msgid "Close" -msgstr "" +msgstr "Loka" -#: js/files.js:254 js/files.js:368 js/files.js:398 +#: js/files.js:248 js/files.js:362 js/files.js:392 msgid "Pending" -msgstr "" +msgstr "Bíður" -#: js/files.js:274 +#: js/files.js:268 msgid "1 file uploading" -msgstr "" +msgstr "1 skrá innsend" -#: js/files.js:277 js/files.js:331 js/files.js:346 +#: js/files.js:271 js/files.js:325 js/files.js:340 msgid "{count} files uploading" -msgstr "" +msgstr "{count} skrár innsendar" -#: js/files.js:349 js/files.js:382 +#: js/files.js:343 js/files.js:376 msgid "Upload cancelled." -msgstr "" +msgstr "Hætt við innsendingu." -#: js/files.js:451 +#: js/files.js:445 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." -msgstr "" +msgstr "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast." -#: js/files.js:523 +#: js/files.js:515 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" -msgstr "" +msgstr "Ógilt nafn á möppu. Nafnið \"Shared\" er frátekið fyrir ownCloud." -#: js/files.js:704 +#: js/files.js:699 msgid "{count} files scanned" -msgstr "" +msgstr "{count} skrár skimaðar" -#: js/files.js:712 +#: js/files.js:707 msgid "error while scanning" -msgstr "" +msgstr "villa við skimun" -#: js/files.js:785 templates/index.php:65 +#: js/files.js:780 templates/index.php:66 msgid "Name" -msgstr "" +msgstr "Nafn" -#: js/files.js:786 templates/index.php:76 +#: js/files.js:781 templates/index.php:77 msgid "Size" -msgstr "" +msgstr "Stærð" -#: js/files.js:787 templates/index.php:78 +#: js/files.js:782 templates/index.php:79 msgid "Modified" -msgstr "" +msgstr "Breytt" -#: js/files.js:814 +#: js/files.js:801 msgid "1 folder" -msgstr "" +msgstr "1 mappa" -#: js/files.js:816 +#: js/files.js:803 msgid "{count} folders" -msgstr "" +msgstr "{count} möppur" -#: js/files.js:824 +#: js/files.js:811 msgid "1 file" -msgstr "" +msgstr "1 skrá" -#: js/files.js:826 +#: js/files.js:813 msgid "{count} files" -msgstr "" +msgstr "{count} skrár" #: templates/admin.php:5 msgid "File handling" -msgstr "" +msgstr "Meðhöndlun skrár" #: templates/admin.php:7 msgid "Maximum upload size" -msgstr "" +msgstr "Hámarks stærð innsendingar" #: templates/admin.php:9 msgid "max. possible: " -msgstr "" +msgstr "hámark mögulegt: " #: templates/admin.php:12 msgid "Needed for multi-file and folder downloads." -msgstr "" +msgstr "Nauðsynlegt til að sækja margar skrár og möppur í einu." #: templates/admin.php:14 msgid "Enable ZIP-download" -msgstr "" +msgstr "Virkja ZIP niðurhal." #: templates/admin.php:17 msgid "0 is unlimited" -msgstr "" +msgstr "0 er ótakmarkað" #: templates/admin.php:19 msgid "Maximum input size for ZIP files" -msgstr "" +msgstr "Hámarks inntaksstærð fyrir ZIP skrár" #: templates/admin.php:23 msgid "Save" -msgstr "" +msgstr "Vista" #: templates/index.php:7 msgid "New" -msgstr "" +msgstr "Nýtt" #: templates/index.php:10 msgid "Text file" -msgstr "" +msgstr "Texta skrá" #: templates/index.php:12 msgid "Folder" -msgstr "" +msgstr "Mappa" #: templates/index.php:14 msgid "From link" -msgstr "" +msgstr "Af tengli" #: templates/index.php:35 msgid "Upload" -msgstr "" +msgstr "Senda inn" #: templates/index.php:43 msgid "Cancel upload" -msgstr "" +msgstr "Hætta við innsendingu" -#: templates/index.php:57 +#: templates/index.php:58 msgid "Nothing in here. Upload something!" -msgstr "" +msgstr "Ekkert hér. Sendu eitthvað inn!" -#: templates/index.php:71 +#: templates/index.php:72 msgid "Download" -msgstr "" +msgstr "Niðurhal" -#: templates/index.php:103 +#: templates/index.php:104 msgid "Upload too large" -msgstr "" +msgstr "Innsend skrá of stór" -#: templates/index.php:105 +#: templates/index.php:106 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." -msgstr "" +msgstr "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni." -#: templates/index.php:110 +#: templates/index.php:111 msgid "Files are being scanned, please wait." -msgstr "" +msgstr "Verið er að skima skrár, vinsamlegast hinkraðu." -#: templates/index.php:113 +#: templates/index.php:114 msgid "Current scanning" -msgstr "" +msgstr "Er að skima" diff --git a/l10n/is/files_encryption.po b/l10n/is/files_encryption.po index aba8a60b74f..3dfd91e61ab 100644 --- a/l10n/is/files_encryption.po +++ b/l10n/is/files_encryption.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-06 00:11+0100\n" -"PO-Revision-Date: 2012-08-12 22:33+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 19:56+0000\n" +"Last-Translator: sveinn \n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,16 +20,16 @@ msgstr "" #: templates/settings.php:3 msgid "Encryption" -msgstr "" +msgstr "Dulkóðun" -#: templates/settings.php:4 -msgid "Exclude the following file types from encryption" -msgstr "" +#: templates/settings.php:6 +msgid "Enable Encryption" +msgstr "Virkja dulkóðun" -#: templates/settings.php:5 +#: templates/settings.php:7 msgid "None" -msgstr "" +msgstr "Ekkert" #: templates/settings.php:12 -msgid "Enable Encryption" -msgstr "" +msgid "Exclude the following file types from encryption" +msgstr "Undanskilja eftirfarandi skráartegundir frá dulkóðun" diff --git a/l10n/is/files_external.po b/l10n/is/files_external.po index a62f4ed1e0a..1e8fbe75517 100644 --- a/l10n/is/files_external.po +++ b/l10n/is/files_external.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-13 00:17+0100\n" -"PO-Revision-Date: 2012-12-11 23:22+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 18:22+0000\n" +"Last-Translator: sveinn \n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,102 +20,102 @@ msgstr "" #: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23 msgid "Access granted" -msgstr "" +msgstr "Aðgengi veitt" #: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86 msgid "Error configuring Dropbox storage" -msgstr "" +msgstr "Villa við að setja upp Dropbox gagnasvæði" #: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40 msgid "Grant access" -msgstr "" +msgstr "Veita aðgengi" #: js/dropbox.js:73 js/google.js:72 msgid "Fill out all required fields" -msgstr "" +msgstr "Fylltu út alla skilyrta reiti" #: js/dropbox.js:85 msgid "Please provide a valid Dropbox app key and secret." -msgstr "" +msgstr "Gefðu upp virkan Dropbox lykil og leynikóða" #: js/google.js:26 js/google.js:73 js/google.js:78 msgid "Error configuring Google Drive storage" -msgstr "" +msgstr "Villa kom upp við að setja upp Google Drive gagnasvæði" #: lib/config.php:434 msgid "" "Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "Aðvörun: \"smbclient\" er ekki uppsettur. Uppsetning á CIFS/SMB gagnasvæðum er ekki möguleg. Hafðu samband við kerfisstjóra til að fá hann uppsettan." #: lib/config.php:435 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 "Aðvörun: FTP stuðningur í PHP er ekki virkur. Uppsetning á FTP gagnasvæðum er ekki möguleg. Hafðu samband við kerfisstjóra til að fá hann uppsettan." #: templates/settings.php:3 msgid "External Storage" -msgstr "" +msgstr "Ytri gagnageymsla" #: templates/settings.php:8 templates/settings.php:22 msgid "Mount point" -msgstr "" +msgstr "Mount svæði" #: templates/settings.php:9 msgid "Backend" -msgstr "" +msgstr "Stjórnun" #: templates/settings.php:10 msgid "Configuration" -msgstr "" +msgstr "Uppsetning" #: templates/settings.php:11 msgid "Options" -msgstr "" +msgstr "Stillingar" #: templates/settings.php:12 msgid "Applicable" -msgstr "" +msgstr "Gilt" #: templates/settings.php:27 msgid "Add mount point" -msgstr "" +msgstr "Bæta við mount svæði" #: templates/settings.php:85 msgid "None set" -msgstr "" +msgstr "Ekkert sett" #: templates/settings.php:86 msgid "All Users" -msgstr "" +msgstr "Allir notendur" #: templates/settings.php:87 msgid "Groups" -msgstr "" +msgstr "Hópar" #: templates/settings.php:95 msgid "Users" -msgstr "" +msgstr "Notendur" #: 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 "" +msgstr "Eyða" #: templates/settings.php:124 msgid "Enable User External Storage" -msgstr "" +msgstr "Virkja ytra gagnasvæði notenda" #: templates/settings.php:125 msgid "Allow users to mount their own external storage" -msgstr "" +msgstr "Leyfa notendum að bæta við sínum eigin ytri gagnasvæðum" -#: templates/settings.php:139 +#: templates/settings.php:136 msgid "SSL root certificates" -msgstr "" +msgstr "SSL rótar skilríki" -#: templates/settings.php:158 +#: templates/settings.php:153 msgid "Import Root Certificate" -msgstr "" +msgstr "Flytja inn rótar skilríki" diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po index 1d9102f0849..d37c6475559 100644 --- a/l10n/is/files_sharing.po +++ b/l10n/is/files_sharing.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-06 00:11+0100\n" -"PO-Revision-Date: 2012-08-12 22:35+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 15:08+0000\n" +"Last-Translator: sveinn \n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,30 +20,30 @@ msgstr "" #: templates/authenticate.php:4 msgid "Password" -msgstr "" +msgstr "Lykilorð" #: templates/authenticate.php:6 msgid "Submit" -msgstr "" +msgstr "Senda" #: templates/public.php:17 #, php-format msgid "%s shared the folder %s with you" -msgstr "" +msgstr "%s deildi möppunni %s með þér" #: templates/public.php:19 #, php-format msgid "%s shared the file %s with you" -msgstr "" +msgstr "%s deildi skránni %s með þér" #: templates/public.php:22 templates/public.php:38 msgid "Download" -msgstr "" +msgstr "Niðurhal" #: templates/public.php:37 msgid "No preview available for" -msgstr "" +msgstr "Yfirlit ekki í boði fyrir" #: templates/public.php:43 msgid "web services under your control" -msgstr "" +msgstr "vefþjónusta undir þinni stjórn" diff --git a/l10n/is/files_versions.po b/l10n/is/files_versions.po index 82fb0358475..bc2e72de575 100644 --- a/l10n/is/files_versions.po +++ b/l10n/is/files_versions.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-06 00:11+0100\n" -"PO-Revision-Date: 2012-08-12 22:37+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 17:42+0000\n" +"Last-Translator: sveinn \n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,26 +18,26 @@ msgstr "" "Language: is\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: js/settings-personal.js:31 templates/settings-personal.php:10 +#: js/settings-personal.js:31 templates/settings-personal.php:7 msgid "Expire all versions" -msgstr "" +msgstr "Úrelda allar útgáfur" #: js/versions.js:16 msgid "History" -msgstr "" +msgstr "Saga" #: templates/settings-personal.php:4 msgid "Versions" -msgstr "" +msgstr "Útgáfur" -#: templates/settings-personal.php:7 +#: templates/settings-personal.php:10 msgid "This will delete all existing backup versions of your files" -msgstr "" +msgstr "Þetta mun eyða öllum afritum af skránum þínum" #: templates/settings.php:3 msgid "Files Versioning" -msgstr "" +msgstr "Útgáfur af skrám" #: templates/settings.php:4 msgid "Enable" -msgstr "" +msgstr "Virkja" diff --git a/l10n/is/lib.po b/l10n/is/lib.po index 8531c69aa27..0e7cb461873 100644 --- a/l10n/is/lib.po +++ b/l10n/is/lib.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-06 00:11+0100\n" -"PO-Revision-Date: 2012-07-27 22:23+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 15:15+0000\n" +"Last-Translator: sveinn \n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,134 +20,134 @@ msgstr "" #: app.php:287 msgid "Help" -msgstr "" +msgstr "Hjálp" #: app.php:294 msgid "Personal" -msgstr "" +msgstr "Um mig" #: app.php:299 msgid "Settings" -msgstr "" +msgstr "Stillingar" #: app.php:304 msgid "Users" -msgstr "" +msgstr "Notendur" #: app.php:311 msgid "Apps" -msgstr "" +msgstr "Forrit" #: app.php:313 msgid "Admin" -msgstr "" +msgstr "Stjórnun" -#: files.php:361 +#: files.php:365 msgid "ZIP download is turned off." -msgstr "" +msgstr "Slökkt á ZIP niðurhali." -#: files.php:362 +#: files.php:366 msgid "Files need to be downloaded one by one." -msgstr "" +msgstr "Skrárnar verður að sækja eina og eina" -#: files.php:362 files.php:387 +#: files.php:366 files.php:391 msgid "Back to Files" -msgstr "" +msgstr "Aftur í skrár" -#: files.php:386 +#: files.php:390 msgid "Selected files too large to generate zip file." -msgstr "" +msgstr "Valdar skrár eru of stórar til að búa til ZIP skrá." #: json.php:28 msgid "Application is not enabled" -msgstr "" +msgstr "Forrit ekki virkt" #: json.php:39 json.php:64 json.php:77 json.php:89 msgid "Authentication error" -msgstr "" +msgstr "Villa við auðkenningu" #: json.php:51 msgid "Token expired. Please reload page." -msgstr "" +msgstr "Auðkenning útrunnin. Vinsamlegast skráðu þig aftur inn." #: search/provider/file.php:17 search/provider/file.php:35 msgid "Files" -msgstr "" +msgstr "Skrár" #: search/provider/file.php:26 search/provider/file.php:33 msgid "Text" -msgstr "" +msgstr "Texti" #: search/provider/file.php:29 msgid "Images" -msgstr "" +msgstr "Myndir" #: template.php:103 msgid "seconds ago" -msgstr "" +msgstr "sek." #: template.php:104 msgid "1 minute ago" -msgstr "" +msgstr "Fyrir 1 mínútu" #: template.php:105 #, php-format msgid "%d minutes ago" -msgstr "" +msgstr "fyrir %d mínútum" #: template.php:106 msgid "1 hour ago" -msgstr "" +msgstr "Fyrir 1 klst." #: template.php:107 #, php-format msgid "%d hours ago" -msgstr "" +msgstr "fyrir %d klst." #: template.php:108 msgid "today" -msgstr "" +msgstr "í dag" #: template.php:109 msgid "yesterday" -msgstr "" +msgstr "í gær" #: template.php:110 #, php-format msgid "%d days ago" -msgstr "" +msgstr "fyrir %d dögum" #: template.php:111 msgid "last month" -msgstr "" +msgstr "síðasta mánuði" #: template.php:112 #, php-format msgid "%d months ago" -msgstr "" +msgstr "fyrir %d mánuðum" #: template.php:113 msgid "last year" -msgstr "" +msgstr "síðasta ári" #: template.php:114 msgid "years ago" -msgstr "" +msgstr "einhverjum árum" #: updater.php:75 #, php-format msgid "%s is available. Get more information" -msgstr "" +msgstr "%s er í boði. Sækja meiri upplýsingar" #: updater.php:77 msgid "up to date" -msgstr "" +msgstr "nýjasta útgáfa" #: updater.php:80 msgid "updates check is disabled" -msgstr "" +msgstr "uppfærslupróf er ekki virkjað" #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" -msgstr "" +msgstr "Fann ekki flokkinn \"%s\"" diff --git a/l10n/is/settings.po b/l10n/is/settings.po index 3842a0e149f..5b2d7ad671a 100644 --- a/l10n/is/settings.po +++ b/l10n/is/settings.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" -"PO-Revision-Date: 2012-12-29 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 17:53+0000\n" +"Last-Translator: sveinn \n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,97 +20,97 @@ msgstr "" #: ajax/apps/ocs.php:20 msgid "Unable to load list from App Store" -msgstr "" +msgstr "Ekki tókst að hlaða lista frá forrita síðu" #: ajax/creategroup.php:10 msgid "Group already exists" -msgstr "" +msgstr "Hópur er þegar til" #: ajax/creategroup.php:19 msgid "Unable to add group" -msgstr "" +msgstr "Ekki tókst að bæta við hóp" #: ajax/enableapp.php:12 msgid "Could not enable app. " -msgstr "" +msgstr "Gat ekki virkjað forrit" #: ajax/lostpassword.php:12 msgid "Email saved" -msgstr "" +msgstr "Netfang vistað" #: ajax/lostpassword.php:14 msgid "Invalid email" -msgstr "" +msgstr "Ógilt netfang" #: ajax/openid.php:13 msgid "OpenID Changed" -msgstr "" +msgstr "OpenID breytt" #: ajax/openid.php:15 ajax/setlanguage.php:17 ajax/setlanguage.php:20 msgid "Invalid request" -msgstr "" +msgstr "Ógild fyrirspurn" #: ajax/removegroup.php:13 msgid "Unable to delete group" -msgstr "" +msgstr "Ekki tókst að eyða hóp" #: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18 msgid "Authentication error" -msgstr "" +msgstr "Villa við auðkenningu" #: ajax/removeuser.php:24 msgid "Unable to delete user" -msgstr "" +msgstr "Ekki tókst að eyða notenda" #: ajax/setlanguage.php:15 msgid "Language changed" -msgstr "" +msgstr "Tungumáli breytt" #: ajax/togglegroups.php:12 msgid "Admins can't remove themself from the admin group" -msgstr "" +msgstr "Stjórnendur geta ekki fjarlægt sjálfa sig úr stjórnendahóp" #: ajax/togglegroups.php:28 #, php-format msgid "Unable to add user to group %s" -msgstr "" +msgstr "Ekki tókst að bæta notenda við hópinn %s" #: ajax/togglegroups.php:34 #, php-format msgid "Unable to remove user from group %s" -msgstr "" +msgstr "Ekki tókst að fjarlægja notanda úr hópnum %s" #: js/apps.js:28 js/apps.js:67 msgid "Disable" -msgstr "" +msgstr "Gera óvirkt" #: js/apps.js:28 js/apps.js:55 msgid "Enable" -msgstr "" +msgstr "Virkja" #: js/personal.js:69 msgid "Saving..." -msgstr "" +msgstr "Er að vista ..." #: personal.php:42 personal.php:43 msgid "__language_name__" -msgstr "" +msgstr "__nafn_tungumáls__" #: templates/apps.php:10 msgid "Add your App" -msgstr "" +msgstr "Bæta við forriti" #: templates/apps.php:11 msgid "More Apps" -msgstr "" +msgstr "Fleiri forrit" #: templates/apps.php:27 msgid "Select an App" -msgstr "" +msgstr "Veldu forrit" #: templates/apps.php:31 msgid "See application page at apps.owncloud.com" -msgstr "" +msgstr "Skoða forrita síðuna hjá apps.owncloud.com" #: templates/apps.php:32 msgid "-licensed by " @@ -117,108 +118,108 @@ msgstr "" #: templates/help.php:3 msgid "User Documentation" -msgstr "" +msgstr "Notenda handbók" #: templates/help.php:4 msgid "Administrator Documentation" -msgstr "" +msgstr "Stjórnenda handbók" #: templates/help.php:6 msgid "Online Documentation" -msgstr "" +msgstr "Handbók á netinu" #: templates/help.php:7 msgid "Forum" -msgstr "" +msgstr "Vefspjall" #: templates/help.php:9 msgid "Bugtracker" -msgstr "" +msgstr "Villubókhald" #: templates/help.php:11 msgid "Commercial Support" -msgstr "" +msgstr "Borgaður stuðningur" #: templates/personal.php:8 #, php-format msgid "You have used %s of the available %s" -msgstr "" +msgstr "Þú hefur notað %s af tiltæku %s" #: templates/personal.php:12 msgid "Clients" -msgstr "" +msgstr "Notendahugbúnaður" #: templates/personal.php:13 msgid "Download Desktop Clients" -msgstr "" +msgstr "Hlaða niður notendahugbúnaði" #: templates/personal.php:14 msgid "Download Android Client" -msgstr "" +msgstr "Hlaða niður Andoid hugbúnaði" #: templates/personal.php:15 msgid "Download iOS Client" -msgstr "" +msgstr "Hlaða niður iOS hugbúnaði" #: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" -msgstr "" +msgstr "Lykilorð" #: templates/personal.php:22 msgid "Your password was changed" -msgstr "" +msgstr "Lykilorði þínu hefur verið breytt" #: templates/personal.php:23 msgid "Unable to change your password" -msgstr "" +msgstr "Ekki tókst að breyta lykilorðinu þínu" #: templates/personal.php:24 msgid "Current password" -msgstr "" +msgstr "Núverandi lykilorð" #: templates/personal.php:25 msgid "New password" -msgstr "" +msgstr "Nýtt lykilorð" #: templates/personal.php:26 msgid "show" -msgstr "" +msgstr "sýna" #: templates/personal.php:27 msgid "Change password" -msgstr "" +msgstr "Breyta lykilorði" #: templates/personal.php:33 msgid "Email" -msgstr "" +msgstr "Netfang" #: templates/personal.php:34 msgid "Your email address" -msgstr "" +msgstr "Netfangið þitt" #: templates/personal.php:35 msgid "Fill in an email address to enable password recovery" -msgstr "" +msgstr "Sláðu inn netfangið þitt til að virkja endurheimt á lykilorði" #: templates/personal.php:41 templates/personal.php:42 msgid "Language" -msgstr "" +msgstr "Tungumál" #: templates/personal.php:47 msgid "Help translate" -msgstr "" +msgstr "Hjálpa við þýðingu" #: templates/personal.php:52 msgid "WebDAV" -msgstr "" +msgstr "WebDAV" #: templates/personal.php:54 msgid "Use this address to connect to your ownCloud in your file manager" -msgstr "" +msgstr "Notaðu þessa vefslóð til að tengjast ownCloud svæðinu þínu" #: templates/personal.php:63 msgid "Version" -msgstr "" +msgstr "Útgáfa" #: templates/personal.php:65 msgid "" @@ -228,44 +229,44 @@ msgid "" "licensed under the AGPL." -msgstr "" +msgstr "Þróað af ownCloud samfélaginu, forrita kóðinn er skráðu með AGPL." #: templates/users.php:21 templates/users.php:81 msgid "Name" -msgstr "" +msgstr "Nafn" #: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" -msgstr "" +msgstr "Hópar" #: templates/users.php:32 msgid "Create" -msgstr "" +msgstr "Búa til" #: templates/users.php:35 msgid "Default Storage" -msgstr "" +msgstr "Sjálfgefin gagnageymsla" #: templates/users.php:42 templates/users.php:138 msgid "Unlimited" -msgstr "" +msgstr "Ótakmarkað" #: templates/users.php:60 templates/users.php:153 msgid "Other" -msgstr "" +msgstr "Annað" #: templates/users.php:85 templates/users.php:117 msgid "Group Admin" -msgstr "" +msgstr "Hópa stjóri" #: templates/users.php:87 msgid "Storage" -msgstr "" +msgstr "gagnapláss" #: templates/users.php:133 msgid "Default" -msgstr "" +msgstr "Sjálfgefið" #: templates/users.php:161 msgid "Delete" -msgstr "" +msgstr "Eyða" diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po index 06ab3b51ea6..828b0b2693a 100644 --- a/l10n/is/user_ldap.po +++ b/l10n/is/user_ldap.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 19:00+0000\n" +"Last-Translator: sveinn \n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,7 +33,7 @@ msgstr "" #: templates/settings.php:15 msgid "Host" -msgstr "" +msgstr "Netþjónn" #: templates/settings.php:15 msgid "" @@ -60,7 +61,7 @@ msgstr "" #: templates/settings.php:18 msgid "Password" -msgstr "" +msgstr "Lykilorð" #: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." @@ -180,4 +181,4 @@ msgstr "" #: templates/settings.php:39 msgid "Help" -msgstr "" +msgstr "Hjálp" diff --git a/l10n/is/user_webdavauth.po b/l10n/is/user_webdavauth.po index 378e437e2a3..859ebae1986 100644 --- a/l10n/is/user_webdavauth.po +++ b/l10n/is/user_webdavauth.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-20 00:11+0100\n" -"PO-Revision-Date: 2012-12-19 23:12+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 21:13+0000\n" +"Last-Translator: sveinn \n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,11 +20,11 @@ msgstr "" #: templates/settings.php:4 msgid "URL: http://" -msgstr "" +msgstr "Vefslóð: http://" #: templates/settings.php:6 msgid "" "ownCloud will send the user credentials to this URL is interpret http 401 " "and http 403 as credentials wrong and all other codes as credentials " "correct." -msgstr "" +msgstr "ownCloud mun senda auðkenni notenda á þessa vefslóð og túkla svörin http 401 og http 403 sem rangar auðkenniupplýsingar og öll önnur svör sem rétt." diff --git a/l10n/it/settings.po b/l10n/it/settings.po index 00d5a41c44a..046096abda4 100644 --- a/l10n/it/settings.po +++ b/l10n/it/settings.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" -"PO-Revision-Date: 2012-12-29 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 07:47+0000\n" +"Last-Translator: Vincenzo Reale \n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -251,11 +251,11 @@ msgstr "Crea" #: templates/users.php:35 msgid "Default Storage" -msgstr "" +msgstr "Archiviazione predefinita" #: templates/users.php:42 templates/users.php:138 msgid "Unlimited" -msgstr "" +msgstr "Illimitata" #: templates/users.php:60 templates/users.php:153 msgid "Other" @@ -267,11 +267,11 @@ msgstr "Gruppo di amministrazione" #: templates/users.php:87 msgid "Storage" -msgstr "" +msgstr "Archiviazione" #: templates/users.php:133 msgid "Default" -msgstr "" +msgstr "Predefinito" #: templates/users.php:161 msgid "Delete" diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po index 52485e8f6f4..ee72c8dd291 100644 --- a/l10n/sv/settings.po +++ b/l10n/sv/settings.po @@ -8,15 +8,16 @@ # , 2011. # Magnus Höglund , 2012. # , 2012. +# , 2012. # , 2011, 2012. # , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" -"PO-Revision-Date: 2012-12-29 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" +"PO-Revision-Date: 2012-12-30 07:10+0000\n" +"Last-Translator: xt00r \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" @@ -251,11 +252,11 @@ msgstr "Skapa" #: templates/users.php:35 msgid "Default Storage" -msgstr "" +msgstr "Förvald lagring" #: templates/users.php:42 templates/users.php:138 msgid "Unlimited" -msgstr "" +msgstr "Obegränsad" #: templates/users.php:60 templates/users.php:153 msgid "Other" @@ -267,11 +268,11 @@ msgstr "Gruppadministratör" #: templates/users.php:87 msgid "Storage" -msgstr "" +msgstr "Lagring" #: templates/users.php:133 msgid "Default" -msgstr "" +msgstr "Förvald" #: templates/users.php:161 msgid "Delete" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 4a7b327861f..cc33a324c89 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"POT-Creation-Date: 2012-12-31 00:04+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.pot b/l10n/templates/files.pot index bafda267119..9834fd44815 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"POT-Creation-Date: 2012-12-31 00:04+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_encryption.pot b/l10n/templates/files_encryption.pot index 4f497da4a5e..1741ce20902 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"POT-Creation-Date: 2012-12-31 00:04+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 616e915131f..ba153383185 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"POT-Creation-Date: 2012-12-31 00:04+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 15c8d37ac46..252ca02fd8c 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"POT-Creation-Date: 2012-12-31 00:04+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_versions.pot b/l10n/templates/files_versions.pot index 81d322f1cfc..50c7690b122 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"POT-Creation-Date: 2012-12-31 00:04+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 2e1e8704e8c..48ce7c8f931 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"POT-Creation-Date: 2012-12-31 00:04+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 9776c97fbb6..b4e0bb7c2ba 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"POT-Creation-Date: 2012-12-31 00:04+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 38da6d21b9f..3090e074b57 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"POT-Creation-Date: 2012-12-31 00:04+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 9237ed079fb..3612d95289b 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" +"POT-Creation-Date: 2012-12-31 00:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php index 63704a978c5..3dcf0646d06 100644 --- a/lib/l10n/hu_HU.php +++ b/lib/l10n/hu_HU.php @@ -5,22 +5,30 @@ "Users" => "Felhasználók", "Apps" => "Alkalmazások", "Admin" => "Admin", -"ZIP download is turned off." => "ZIP-letöltés letiltva", -"Files need to be downloaded one by one." => "A file-okat egyenként kell letölteni", -"Back to Files" => "Vissza a File-okhoz", -"Selected files too large to generate zip file." => "Túl nagy file-ok a zip-generáláshoz", +"ZIP download is turned off." => "A ZIP-letöltés nem engedélyezett.", +"Files need to be downloaded one by one." => "A fájlokat egyenként kell letölteni", +"Back to Files" => "Vissza a Fájlokhoz", +"Selected files too large to generate zip file." => "A kiválasztott fájlok túl nagy a zip tömörítéshez.", "Application is not enabled" => "Az alkalmazás nincs engedélyezve", "Authentication error" => "Hitelesítési hiba", -"Token expired. Please reload page." => "A token lejárt. Frissítsd az oldalt.", +"Token expired. Please reload page." => "A token lejárt. Frissítse az oldalt.", "Files" => "Fájlok", "Text" => "Szöveg", -"seconds ago" => "másodperccel ezelőtt", -"1 minute ago" => "1 perccel ezelőtt", -"%d minutes ago" => "%d perccel ezelőtt", +"Images" => "Képek", +"seconds ago" => "másodperce", +"1 minute ago" => "1 perce", +"%d minutes ago" => "%d perce", +"1 hour ago" => "1 órája", +"%d hours ago" => "%d órája", "today" => "ma", "yesterday" => "tegnap", -"%d days ago" => "%d évvel ezelőtt", +"%d days ago" => "%d napja", "last month" => "múlt hónapban", +"%d months ago" => "%d hónapja", "last year" => "tavaly", -"years ago" => "évvel ezelőtt" +"years ago" => "éve", +"%s is available. Get more information" => "%s elérhető. További információ.", +"up to date" => "a legfrissebb változat", +"updates check is disabled" => "A frissitések ellenőrzése nincs engedélyezve.", +"Could not find category \"%s\"" => "Ez a kategória nem található: \"%s\"" ); diff --git a/lib/l10n/is.php b/lib/l10n/is.php new file mode 100644 index 00000000000..8fdb45a05cd --- /dev/null +++ b/lib/l10n/is.php @@ -0,0 +1,34 @@ + "Hjálp", +"Personal" => "Um mig", +"Settings" => "Stillingar", +"Users" => "Notendur", +"Apps" => "Forrit", +"Admin" => "Stjórnun", +"ZIP download is turned off." => "Slökkt á ZIP niðurhali.", +"Files need to be downloaded one by one." => "Skrárnar verður að sækja eina og eina", +"Back to Files" => "Aftur í skrár", +"Selected files too large to generate zip file." => "Valdar skrár eru of stórar til að búa til ZIP skrá.", +"Application is not enabled" => "Forrit ekki virkt", +"Authentication error" => "Villa við auðkenningu", +"Token expired. Please reload page." => "Auðkenning útrunnin. Vinsamlegast skráðu þig aftur inn.", +"Files" => "Skrár", +"Text" => "Texti", +"Images" => "Myndir", +"seconds ago" => "sek.", +"1 minute ago" => "Fyrir 1 mínútu", +"%d minutes ago" => "fyrir %d mínútum", +"1 hour ago" => "Fyrir 1 klst.", +"%d hours ago" => "fyrir %d klst.", +"today" => "í dag", +"yesterday" => "í gær", +"%d days ago" => "fyrir %d dögum", +"last month" => "síðasta mánuði", +"%d months ago" => "fyrir %d mánuðum", +"last year" => "síðasta ári", +"years ago" => "einhverjum árum", +"%s is available. Get more information" => "%s er í boði. Sækja meiri upplýsingar", +"up to date" => "nýjasta útgáfa", +"updates check is disabled" => "uppfærslupróf er ekki virkjað", +"Could not find category \"%s\"" => "Fann ekki flokkinn \"%s\"" +); diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php index a23314a2cc6..d86376d5672 100644 --- a/settings/l10n/cs_CZ.php +++ b/settings/l10n/cs_CZ.php @@ -53,7 +53,11 @@ "Name" => "Jméno", "Groups" => "Skupiny", "Create" => "Vytvořit", +"Default Storage" => "Výchozí úložiště", +"Unlimited" => "Neomezeně", "Other" => "Jiná", "Group Admin" => "Správa skupiny", +"Storage" => "Úložiště", +"Default" => "Výchozí", "Delete" => "Smazat" ); diff --git a/settings/l10n/de.php b/settings/l10n/de.php index e54aea3bb99..6434d23a5ba 100644 --- a/settings/l10n/de.php +++ b/settings/l10n/de.php @@ -53,7 +53,11 @@ "Name" => "Name", "Groups" => "Gruppen", "Create" => "Anlegen", +"Default Storage" => "Standard-Speicher", +"Unlimited" => "Unbegrenzt", "Other" => "Andere", "Group Admin" => "Gruppenadministrator", +"Storage" => "Speicher", +"Default" => "Standard", "Delete" => "Löschen" ); diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php index 7fc439f8222..10914350d74 100644 --- a/settings/l10n/de_DE.php +++ b/settings/l10n/de_DE.php @@ -53,7 +53,11 @@ "Name" => "Name", "Groups" => "Gruppen", "Create" => "Anlegen", +"Default Storage" => "Standard-Speicher", +"Unlimited" => "Unbegrenzt", "Other" => "Andere", "Group Admin" => "Gruppenadministrator", +"Storage" => "Speicher", +"Default" => "Standard", "Delete" => "Löschen" ); diff --git a/settings/l10n/es.php b/settings/l10n/es.php index 874f5e2a1be..bd7d2866601 100644 --- a/settings/l10n/es.php +++ b/settings/l10n/es.php @@ -53,7 +53,11 @@ "Name" => "Nombre", "Groups" => "Grupos", "Create" => "Crear", +"Default Storage" => "Almacenamiento Predeterminado", +"Unlimited" => "Ilimitado", "Other" => "Otro", "Group Admin" => "Grupo admin", +"Storage" => "Alamacenamiento", +"Default" => "Predeterminado", "Delete" => "Eliminar" ); diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php index b7bd0a22da9..03f6c5593d4 100644 --- a/settings/l10n/es_AR.php +++ b/settings/l10n/es_AR.php @@ -53,7 +53,11 @@ "Name" => "Nombre", "Groups" => "Grupos", "Create" => "Crear", +"Default Storage" => "Almacenamiento Predeterminado", +"Unlimited" => "Ilimitado", "Other" => "Otro", "Group Admin" => "Grupo Administrador", +"Storage" => "Almacenamiento", +"Default" => "Predeterminado", "Delete" => "Borrar" ); diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php index 3c7f6a43e4d..a8367ef458d 100644 --- a/settings/l10n/fr.php +++ b/settings/l10n/fr.php @@ -53,7 +53,11 @@ "Name" => "Nom", "Groups" => "Groupes", "Create" => "Créer", +"Default Storage" => "Support de stockage par défaut", +"Unlimited" => "Illimité", "Other" => "Autre", "Group Admin" => "Groupe Admin", +"Storage" => "Support de stockage", +"Default" => "Défaut", "Delete" => "Supprimer" ); diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php index 124dd4c4eb7..5fdc11e44f9 100644 --- a/settings/l10n/hu_HU.php +++ b/settings/l10n/hu_HU.php @@ -22,6 +22,7 @@ "More Apps" => "További alkalmazások", "Select an App" => "Válasszon egy alkalmazást", "See application page at apps.owncloud.com" => "Lásd apps.owncloud.com, alkalmazások oldal", +"-licensed by " => "-a jogtuladonos ", "User Documentation" => "Felhasználói leírás", "Administrator Documentation" => "Üzemeltetői leírás", "Online Documentation" => "Online leírás", @@ -41,13 +42,14 @@ "show" => "lássam", "Change password" => "A jelszó megváltoztatása", "Email" => "Email", -"Your email address" => "Az Ön emailcíme", -"Fill in an email address to enable password recovery" => "Töltse ki az emailcímet, hogy jelszó-emlékeztetőt kérhessen, ha elfelejtette a jelszavát!", +"Your email address" => "Az Ön email címe", +"Fill in an email address to enable password recovery" => "Adja meg az email címét, hogy jelszó-emlékeztetőt kérhessen, ha elfelejtette a jelszavát!", "Language" => "Nyelv", "Help translate" => "Segítsen a fordításban!", -"WebDAV" => "WebDAV elérés: ", +"WebDAV" => "WebDAV", "Use this address to connect to your ownCloud in your file manager" => "Ennek a címnek a megadásával a WebDAV-protokollon keresztül saját gépének fájlkezelőjével is is elérheti az állományait.", "Version" => "Verzió", +"Developed by the ownCloud community, the source code is licensed under the AGPL." => "A programot az ownCloud közösség fejleszti. A forráskód az AGPL feltételei mellett használható föl.", "Name" => "Név", "Groups" => "Csoportok", "Create" => "Létrehozás", diff --git a/settings/l10n/is.php b/settings/l10n/is.php new file mode 100644 index 00000000000..2056dfc5b72 --- /dev/null +++ b/settings/l10n/is.php @@ -0,0 +1,62 @@ + "Ekki tókst að hlaða lista frá forrita síðu", +"Group already exists" => "Hópur er þegar til", +"Unable to add group" => "Ekki tókst að bæta við hóp", +"Could not enable app. " => "Gat ekki virkjað forrit", +"Email saved" => "Netfang vistað", +"Invalid email" => "Ógilt netfang", +"OpenID Changed" => "OpenID breytt", +"Invalid request" => "Ógild fyrirspurn", +"Unable to delete group" => "Ekki tókst að eyða hóp", +"Authentication error" => "Villa við auðkenningu", +"Unable to delete user" => "Ekki tókst að eyða notenda", +"Language changed" => "Tungumáli breytt", +"Admins can't remove themself from the admin group" => "Stjórnendur geta ekki fjarlægt sjálfa sig úr stjórnendahóp", +"Unable to add user to group %s" => "Ekki tókst að bæta notenda við hópinn %s", +"Unable to remove user from group %s" => "Ekki tókst að fjarlægja notanda úr hópnum %s", +"Disable" => "Gera óvirkt", +"Enable" => "Virkja", +"Saving..." => "Er að vista ...", +"__language_name__" => "__nafn_tungumáls__", +"Add your App" => "Bæta við forriti", +"More Apps" => "Fleiri forrit", +"Select an App" => "Veldu forrit", +"See application page at apps.owncloud.com" => "Skoða forrita síðuna hjá apps.owncloud.com", +"User Documentation" => "Notenda handbók", +"Administrator Documentation" => "Stjórnenda handbók", +"Online Documentation" => "Handbók á netinu", +"Forum" => "Vefspjall", +"Bugtracker" => "Villubókhald", +"Commercial Support" => "Borgaður stuðningur", +"You have used %s of the available %s" => "Þú hefur notað %s af tiltæku %s", +"Clients" => "Notendahugbúnaður", +"Download Desktop Clients" => "Hlaða niður notendahugbúnaði", +"Download Android Client" => "Hlaða niður Andoid hugbúnaði", +"Download iOS Client" => "Hlaða niður iOS hugbúnaði", +"Password" => "Lykilorð", +"Your password was changed" => "Lykilorði þínu hefur verið breytt", +"Unable to change your password" => "Ekki tókst að breyta lykilorðinu þínu", +"Current password" => "Núverandi lykilorð", +"New password" => "Nýtt lykilorð", +"show" => "sýna", +"Change password" => "Breyta lykilorði", +"Email" => "Netfang", +"Your email address" => "Netfangið þitt", +"Fill in an email address to enable password recovery" => "Sláðu inn netfangið þitt til að virkja endurheimt á lykilorði", +"Language" => "Tungumál", +"Help translate" => "Hjálpa við þýðingu", +"WebDAV" => "WebDAV", +"Use this address to connect to your ownCloud in your file manager" => "Notaðu þessa vefslóð til að tengjast ownCloud svæðinu þínu", +"Version" => "Útgáfa", +"Developed by the ownCloud community, the source code is licensed under the AGPL." => "Þróað af ownCloud samfélaginu, forrita kóðinn er skráðu með AGPL.", +"Name" => "Nafn", +"Groups" => "Hópar", +"Create" => "Búa til", +"Default Storage" => "Sjálfgefin gagnageymsla", +"Unlimited" => "Ótakmarkað", +"Other" => "Annað", +"Group Admin" => "Hópa stjóri", +"Storage" => "gagnapláss", +"Default" => "Sjálfgefið", +"Delete" => "Eyða" +); diff --git a/settings/l10n/it.php b/settings/l10n/it.php index c9717932978..043f1a2db9d 100644 --- a/settings/l10n/it.php +++ b/settings/l10n/it.php @@ -53,7 +53,11 @@ "Name" => "Nome", "Groups" => "Gruppi", "Create" => "Crea", +"Default Storage" => "Archiviazione predefinita", +"Unlimited" => "Illimitata", "Other" => "Altro", "Group Admin" => "Gruppo di amministrazione", +"Storage" => "Archiviazione", +"Default" => "Predefinito", "Delete" => "Elimina" ); diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php index bc4ec8c64d7..681db2099a1 100644 --- a/settings/l10n/sv.php +++ b/settings/l10n/sv.php @@ -53,7 +53,11 @@ "Name" => "Namn", "Groups" => "Grupper", "Create" => "Skapa", +"Default Storage" => "Förvald lagring", +"Unlimited" => "Obegränsad", "Other" => "Annat", "Group Admin" => "Gruppadministratör", +"Storage" => "Lagring", +"Default" => "Förvald", "Delete" => "Radera" ); -- cgit v1.2.3 From 218a5ea89014322592bd8c4789d8500d42029b9f Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Mon, 31 Dec 2012 14:16:29 +0000 Subject: Remove unused methods --- lib/ocs/result.php | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'lib') diff --git a/lib/ocs/result.php b/lib/ocs/result.php index 24029051da5..4531da5ae0d 100644 --- a/lib/ocs/result.php +++ b/lib/ocs/result.php @@ -14,14 +14,6 @@ class OC_OCS_Result{ $this->message = $message; } - /** - * sets the statuscode - * @param $code int - */ - public function setCode(int $code){ - $this->statuscode = $code; - } - /** * optionally set the total number of items available * @param $items int @@ -38,14 +30,6 @@ class OC_OCS_Result{ $this->perpage = $items; } - /** - * set a custom message for the response - * @param $message string the message - */ - public function setMessage(string $message){ - $this->message = $message; - } - /** * returns the data associated with the api result * @return array -- cgit v1.2.3 From 9626d9ce31c6144583481e26763c6a59ca52cf7a Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Mon, 31 Dec 2012 16:08:21 +0000 Subject: Code cleanup and add copyright info --- lib/ocs/config.php | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/ocs/config.php b/lib/ocs/config.php index 52affcd65ee..03c54aa2314 100644 --- a/lib/ocs/config.php +++ b/lib/ocs/config.php @@ -1,8 +1,30 @@ . +* +*/ class OC_OCS_Config { - public static function apiConfig($parameters){ + public static function apiConfig($parameters) { $xml['version'] = '1.7'; $xml['website'] = 'ownCloud'; $xml['host'] = OCP\Util::getServerHost(); -- cgit v1.2.3 From 8a5f583cac8952e978e560be46b25d664ba6447a Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Mon, 31 Dec 2012 16:19:46 +0000 Subject: Remove WIP OAuth code --- lib/oauth/server.php | 111 --------------------------------------------------- lib/oauth/store.php | 95 ------------------------------------------- 2 files changed, 206 deletions(-) delete mode 100644 lib/oauth/server.php delete mode 100644 lib/oauth/store.php (limited to 'lib') diff --git a/lib/oauth/server.php b/lib/oauth/server.php deleted file mode 100644 index a82a1e2fb0e..00000000000 --- a/lib/oauth/server.php +++ /dev/null @@ -1,111 +0,0 @@ -. -* -*/ - -require_once(OC::$THIRDPARTYROOT.'/3rdparty/OAuth/OAuth.php'); - -class OC_OAuth_Server extends OAuthServer { - - /** - * sets up the server object - */ - public static function init(){ - $server = new OC_OAuth_Server(new OC_OAuth_Store()); - $server->add_signature_method(new OAuthSignatureMethod_HMAC_SHA1()); - return $server; - } - - public function get_request_token(&$request){ - // Check the signature - $token = $this->fetch_request_token($request); - $scopes = $request->get_parameter('scopes'); - // Add scopes to request token - $this->saveScopes($token, $scopes); - - return $token; - } - - public function saveScopes($token, $scopes){ - $query = OC_DB::prepare("INSERT INTO `*PREFIX*oauth_scopes` (`key`, `scopes`) VALUES (?, ?)"); - $result = $query->execute(array($token->key, $scopes)); - } - - - /** - * authorises a request token - * @param string $request the request token to authorise - * @return What does it return? - */ - public function authoriseRequestToken(&$request) { - $this->get_version($request); - $consumer = $this->get_consumer($request); - $this->check_signature($request, $consumer, null); - $token = $this->get_token($request, $consumer, 'request'); - $this->check_signature($request, $consumer, $token); - return $this->data_store->authorise_request_token($token, $consumer, OC_User::getUser()); - } - - /** - * checks if request is authorised - * TODO distinguish between failures as one is a 400 error and other is 401 - * @return string|int - */ - public static function isAuthorised($scope) { - try { - $request = OAuthRequest::from_request(); - //$this->verify_request(); // TODO cannot use $this in static context - return true; - } catch (OAuthException $exception) { - return false; - } - // TODO Get user out of token? May have to write own verify_request() -// $run = true; -// OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $user )); -// if(!$run){ -// return false; -// } -// OC_User::setUserId($user); -// OC_Hook::emit( "OC_User", "post_login", array( "uid" => $user )); -// return $user; - } - - /** - * registers a consumer with the ownCloud Instance - * @param string $name the name of the external app - * @param string $url the url to find out more info on the external app - * @param string $callbacksuccess the url to redirect to after autorisation success - * @param string $callbackfail the url to redirect to if the user does not authorise the application - * @return false|OAuthConsumer object - */ - static function register_consumer($name, $url, $callbacksuccess=null, $callbackfail=null){ - // TODO validation - // Check callback url is outside of ownCloud for security - // Generate key and secret - $key = sha1(md5(uniqid(rand(), true))); - $secret = sha1(md5(uniqid(rand(), true))); - $query = OC_DB::prepare("INSERT INTO `*PREFIX*oauth_consumers` (`key`, `secret`, `name`, `url`, `callback_success`, `callback_fail`) VALUES (?, ?, ?, ?, ?, ?)"); - $result = $query->execute(array($key, $secret, $name, $url, $callbacksuccess, $callbackfail)); - return new OAuthConsumer($key, $secret, $callbacksuccess); - } - -} \ No newline at end of file diff --git a/lib/oauth/store.php b/lib/oauth/store.php deleted file mode 100644 index aa68d38957d..00000000000 --- a/lib/oauth/store.php +++ /dev/null @@ -1,95 +0,0 @@ -. -* -*/ - -class OC_OAuth_Store extends OAuthDataStore { - - static private $MAX_TIMESTAMP_DIFFERENCE = 300; - - function lookup_consumer($consumer_key) { - $query = OC_DB::prepare("SELECT `key`, `secret`, `callback_success` FROM `*PREFIX*oauth_consumers` WHERE `key` = ?"); - $results = $query->execute(array($consumer_key)); - if($results->numRows()==0){ - return NULL; - } else { - $details = $results->fetchRow(); - $callback = !empty($details['callback_success']) ? $details['callback_success'] : NULL; - return new OAuthConsumer($details['key'], $details['secret'], $callback); - } - } - - function lookup_token($consumer, $token_type, $token) { - $query = OC_DB::prepare("SELECT `key`, `secret`, `type` FROM `*PREFIX*oauth_tokens` WHERE `consumer_key` = ? AND `key` = ? AND `type` = ?"); - $results = $query->execute(array($consumer->key, $token->key, $token_type)); - if($results->numRows()==0){ - return NULL; - } else { - $token = $results->fetchRow(); - return new OAuthToken($token['key'], $token['secret']); - } - } - - function lookup_nonce($consumer, $token, $nonce, $timestamp) { - $query = OC_DB::prepare("INSERT INTO `*PREFIX*oauth_nonce` (`consumer_key`, `token`, `timestamp`, `nonce`) VALUES (?, ?, ?, ?)"); - $affectedrows = $query->execute(array($consumer->key, $token, $timestamp, $nonce)); - // Delete all timestamps older than the one passed - $query = OC_DB::prepare("DELETE FROM `*PREFIX*oauth_nonce` WHERE `consumer_key` = ? AND `token` = ? AND `timestamp` < ?"); - $result = $query->exec(array($consumer->key, $token, $timestamp - self::$MAX_TIMESTAMP_DIFFERENCE)); - return $result; - } - - function new_token($consumer, $token_type) { - $key = md5(time()); - $secret = time() + time(); - $token = new OAuthToken($key, md5(md5($secret))); - $query = OC_DB::prepare("INSERT INTO `*PREFIX*oauth_tokens` (`consumer_key`, `key`, `secret`, `type`, `timestamp`) VALUES (?, ?, ?, ?, ?, ?)"); - $result = $query->execute(array($consumer->key, $key, $secret, $token_type, time())); - return $token; - } - - function new_request_token($consumer, $callback = null) { - return $this->new_token($consumer, 'request'); - } - - function authorise_request_token($token, $consumer, $uid) { - $query = OC_DB::prepare("UPDATE `*PREFIX*oauth_tokens` SET uid = ? WHERE `consumer_key` = ? AND `key` = ? AND `type` = ?"); - $query->execute(array($uid, $consumer->key, $token->key, 'request')); - // TODO Return oauth_verifier - } - - function new_access_token($token, $consumer, $verifier = null) { - $query = OC_DB::prepare("SELECT `timestamp`, `scope` FROM `*PREFIX*oauth_tokens` WHERE `consumer_key` = ? AND `key` = ? AND `type` = ?"); - $result = $query->execute(array($consumer->key, $token->key, 'request'))->fetchRow(); - if (isset($result['timestamp'])) { - if ($timestamp + self::MAX_REQUEST_TOKEN_TTL < time()) { - return false; - } - $accessToken = $this->new_token($consumer, 'access', $result['scope']); - } - // Delete request token - $query = OC_DB::prepare("DELETE FROM `*PREFIX*oauth_tokens` WHERE `key` = ? AND `type` = ?"); - $query->execute(array($token->key, 'request')); - return $accessToken; - } - -} \ No newline at end of file -- cgit v1.2.3 From 54f6f1e6b7de3c5ce2414c9f436af1defa6c3c78 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 25 Dec 2012 18:17:32 +0100 Subject: phpdoc fixes for public api --- lib/public/db.php | 8 ++-- lib/public/response.php | 18 ++++---- lib/public/util.php | 116 ++++++++++++++++++++++++------------------------ 3 files changed, 71 insertions(+), 71 deletions(-) (limited to 'lib') diff --git a/lib/public/db.php b/lib/public/db.php index 92ff8f93a22..5d4aadd22ae 100644 --- a/lib/public/db.php +++ b/lib/public/db.php @@ -36,8 +36,8 @@ namespace OCP; class DB { /** * @brief Prepare a SQL query - * @param $query Query string - * @returns prepared SQL query + * @param string $query Query string + * @return \MDB2_Statement_Common prepared SQL query * * SQL query via MDB2 prepare(), needs to be execute()'d! */ @@ -59,7 +59,7 @@ class DB { * 'family' => array ('value' => 'Stefanov'), * 'birth_date' => array ('value' => '1975-06-20') * ); - * @returns true/false + * @return bool * */ public static function insertIfNotExist($table, $input) { @@ -69,7 +69,7 @@ class DB { /** * @brief gets last value of autoincrement * @param $table string The optional table name (will replace *PREFIX*) and add sequence suffix - * @returns id + * @return int * * MDB2 lastInsertID() * diff --git a/lib/public/response.php b/lib/public/response.php index 95e67a85720..bfb84eda5d1 100644 --- a/lib/public/response.php +++ b/lib/public/response.php @@ -31,12 +31,12 @@ namespace OCP; /** - * This class provides convinient functions to send the correct http response headers + * This class provides convenient functions to send the correct http response headers */ class Response { /** * @brief Enable response caching by sending correct HTTP headers - * @param $cache_time time to cache the response + * @param int $cache_time time to cache the response * >0 cache time in seconds * 0 and <0 enable default browser caching * null cache indefinitly @@ -48,7 +48,7 @@ class Response { /** * Checks and set Last-Modified header, when the request matches sends a * 'not modified' response - * @param $lastModified time when the reponse was last modified + * @param string $lastModified time when the reponse was last modified */ static public function setLastModifiedHeader( $lastModified ) { return(\OC_Response::setLastModifiedHeader( $lastModified )); @@ -65,7 +65,7 @@ class Response { /** * Checks and set ETag header, when the request matches sends a * 'not modified' response - * @param $etag token to use for modification check + * @param string $etag token to use for modification check */ static public function setETagHeader( $etag ) { return(\OC_Response::setETagHeader( $etag )); @@ -73,15 +73,15 @@ class Response { /** * @brief Send file as response, checking and setting caching headers - * @param $filepath of file to send + * @param string $filepath of file to send */ static public function sendFile( $filepath ) { return(\OC_Response::sendFile( $filepath )); } /** - * @brief Set reponse expire time - * @param $expires date-time when the response expires + * @brief Set response expire time + * @param string|\DateTime $expires date-time when the response expires * string for DateInterval from now * DateTime object when to expire response */ @@ -91,9 +91,9 @@ class Response { /** * @brief Send redirect response - * @param $location to redirect to + * @param string $location to redirect to */ static public function redirect( $location ) { return(\OC_Response::redirect( $location )); } -} \ No newline at end of file +} diff --git a/lib/public/util.php b/lib/public/util.php index af782b01483..df09ea81ae1 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -68,7 +68,7 @@ class Util { * @brief write a message in the log * @param string $app * @param string $message - * @param int level + * @param int $level */ public static function writeLog( $app, $message, $level ) { // call the internal log class @@ -77,7 +77,7 @@ class Util { /** * @brief add a css file - * @param url $url + * @param string $url */ public static function addStyle( $application, $file = null ) { \OC_Util::addStyle( $application, $file ); @@ -85,8 +85,8 @@ class Util { /** * @brief add a javascript file - * @param appid $application - * @param filename $file + * @param string $application + * @param string $file */ public static function addScript( $application, $file = null ) { \OC_Util::addScript( $application, $file ); @@ -94,7 +94,7 @@ class Util { /** * @brief Add a custom element to the header - * @param string tag tag name of the element + * @param string $tag tag name of the element * @param array $attributes array of attributes for the element * @param string $text the text content for the element */ @@ -104,8 +104,8 @@ class Util { /** * @brief formats a timestamp in the "right" way - * @param int timestamp $timestamp - * @param bool dateOnly option to ommit time from the result + * @param int $timestamp $timestamp + * @param bool $dateOnly option to omit time from the result */ public static function formatDate( $timestamp, $dateOnly=false) { return(\OC_Util::formatDate( $timestamp, $dateOnly )); @@ -113,11 +113,11 @@ class Util { /** * @brief Creates an absolute url - * @param $app app - * @param $file file - * @param $args array with param=>value, will be appended to the returned url + * @param string $app app + * @param string $file file + * @param array $args array with param=>value, will be appended to the returned url * The value of $args will be urlencoded - * @returns the url + * @returns string the url * * Returns a absolute url to the given app and file. */ @@ -127,8 +127,8 @@ class Util { /** * @brief Creates an absolute url for remote use - * @param $service id - * @returns the url + * @param string $service id + * @returns string the url * * Returns a absolute url to the given app and file. */ @@ -138,8 +138,8 @@ class Util { /** * @brief Creates an absolute url for public use - * @param $service id - * @returns the url + * @param string $service id + * @returns string the url * * Returns a absolute url to the given app and file. */ @@ -149,11 +149,11 @@ class Util { /** * @brief Creates an url - * @param $app app - * @param $file file - * @param $args array with param=>value, will be appended to the returned url + * @param string $app app + * @param string $file file + * @param array $args array with param=>value, will be appended to the returned url * The value of $args will be urlencoded - * @returns the url + * @returns string the url * * Returns a url to the given app and file. */ @@ -163,7 +163,7 @@ class Util { /** * @brief Returns the server host - * @returns the server host + * @returns string the server host * * Returns the server host, even if the website uses one or more * reverse proxies @@ -174,7 +174,7 @@ class Util { /** * @brief returns the server hostname - * @returns the server hostname + * @returns string the server hostname * * Returns the server host name without an eventual port number */ @@ -190,8 +190,8 @@ class Util { /** * @brief Returns the default email address - * @param $user_part the user part of the address - * @returns the default email address + * @param string $user_part the user part of the address + * @returns string the default email address * * Assembles a default email address (using the server hostname * and the given user part, and returns it @@ -210,7 +210,7 @@ class Util { /** * @brief Returns the server protocol - * @returns the server protocol + * @returns string the server protocol * * Returns the server protocol. It respects reverse proxy servers and load balancers */ @@ -220,9 +220,9 @@ class Util { /** * @brief Creates path to an image - * @param $app app - * @param $image image name - * @returns the url + * @param string $app app + * @param string $image image name + * @returns string the url * * Returns the path to the image. */ @@ -232,8 +232,8 @@ class Util { /** * @brief Make a human file size - * @param $bytes file size in bytes - * @returns a human readable file size + * @param int $bytes file size in bytes + * @returns string a human readable file size * * Makes 2048 to 2 kB. */ @@ -243,8 +243,8 @@ class Util { /** * @brief Make a computer file size - * @param $str file size in a fancy format - * @returns a file size in bytes + * @param string $str file size in a fancy format + * @returns int a file size in bytes * * Makes 2kB to 2048. * @@ -256,11 +256,11 @@ class Util { /** * @brief connects a function to a hook - * @param $signalclass class name of emitter - * @param $signalname name of signal - * @param $slotclass class name of slot - * @param $slotname name of slot - * @returns true/false + * @param string $signalclass class name of emitter + * @param string $signalname name of signal + * @param string $slotclass class name of slot + * @param string $slotname name of slot + * @returns bool * * This function makes it very easy to connect to use hooks. * @@ -272,10 +272,10 @@ class Util { /** * @brief emitts a signal - * @param $signalclass class name of emitter - * @param $signalname name of signal - * @param $params defautl: array() array with additional data - * @returns true if slots exists or false if not + * @param string $signalclass class name of emitter + * @param string $signalname name of signal + * @param string $params defautl: array() array with additional data + * @returns bool true if slots exists or false if not * * Emits a signal. To get data from the slot use references! * @@ -306,7 +306,7 @@ class Util { * * This function is used to sanitize HTML and should be applied on any string or array of strings before displaying it on a web page. * - * @param string or array of strings + * @param string|array of strings * @return array with sanitized strings or a single sinitized string, depends on the input parameter. */ public static function sanitizeHTML( $value ) { @@ -316,9 +316,9 @@ class Util { /** * @brief Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is. * - * @param $input The array to work on - * @param $case Either MB_CASE_UPPER or MB_CASE_LOWER (default) - * @param $encoding The encoding parameter is the character encoding. Defaults to UTF-8 + * @param array $input The array to work on + * @param int $case Either MB_CASE_UPPER or MB_CASE_LOWER (default) + * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8 * @return array * * @@ -330,11 +330,11 @@ class Util { /** * @brief replaces a copy of string delimited by the start and (optionally) length parameters with the string given in replacement. * - * @param $input The input string. .Opposite to the PHP build-in function does not accept an array. - * @param $replacement The replacement string. - * @param $start If start is positive, the replacing will begin at the start'th offset into string. If start is negative, the replacing will begin at the start'th character from the end of string. - * @param $length Length of the part to be replaced - * @param $encoding The encoding parameter is the character encoding. Defaults to UTF-8 + * @param string $input The input string. .Opposite to the PHP build-in function does not accept an array. + * @param string $replacement The replacement string. + * @param int $start If start is positive, the replacing will begin at the start'th offset into string. If start is negative, the replacing will begin at the start'th character from the end of string. + * @param int $length Length of the part to be replaced + * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8 * @return string * */ @@ -345,11 +345,11 @@ class Util { /** * @brief Replace all occurrences of the search string with the replacement string * - * @param $search The value being searched for, otherwise known as the needle. String. - * @param $replace The replacement string. - * @param $subject The string or array being searched and replaced on, otherwise known as the haystack. - * @param $encoding The encoding parameter is the character encoding. Defaults to UTF-8 - * @param $count If passed, this will be set to the number of replacements performed. + * @param string $search The value being searched for, otherwise known as the needle. String. + * @param string $replace The replacement string. + * @param string $subject The string or array being searched and replaced on, otherwise known as the haystack. + * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8 + * @param int $count If passed, this will be set to the number of replacements performed. * @return string * */ @@ -359,10 +359,10 @@ class Util { /** * @brief performs a search in a nested array - * @param haystack the array to be searched - * @param needle the search string - * @param $index optional, only search this key name - * @return the key of the matching field, otherwise false + * @param array $haystack the array to be searched + * @param string $needle the search string + * @param int $index optional, only search this key name + * @return mixed the key of the matching field, otherwise false */ public static function recursiveArraySearch($haystack, $needle, $index = null) { return(\OC_Helper::recursiveArraySearch($haystack, $needle, $index)); -- cgit v1.2.3 From 1727b2e84d9c6202f4777dff3c6b7433ec8783c7 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Wed, 2 Jan 2013 19:04:08 +0100 Subject: add smtp port configuration option --- config/config.sample.php | 3 +++ lib/mail.php | 14 ++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/config/config.sample.php b/config/config.sample.php index 78dfe17ea79..2eec7847f9c 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -78,6 +78,9 @@ $CONFIG = array( /* Host to use for sending mail, depends on mail_smtpmode if this is used */ "mail_smtphost" => "127.0.0.1", +/* Port to use for sending mail, depends on mail_smtpmode if this is used */ +"mail_smtpport" => 25, + /* authentication needed to send mail, depends on mail_smtpmode if this is used * (false = disable authentication) */ diff --git a/lib/mail.php b/lib/mail.php index c78fcce88d4..4683a1b4eee 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -25,12 +25,18 @@ class OC_Mail { * @param string $mailtext * @param string $fromaddress * @param string $fromname - * @param bool $html + * @param bool|int $html + * @param string $altbody + * @param string $ccaddress + * @param string $ccname + * @param string $bcc + * @throws Exception */ public static function send($toaddress,$toname,$subject,$mailtext,$fromaddress,$fromname,$html=0,$altbody='',$ccaddress='',$ccname='', $bcc='') { $SMTPMODE = OC_Config::getValue( 'mail_smtpmode', 'sendmail' ); $SMTPHOST = OC_Config::getValue( 'mail_smtphost', '127.0.0.1' ); + $SMTPPORT = OC_Config::getValue( 'mail_smtpport', 25 ); $SMTPAUTH = OC_Config::getValue( 'mail_smtpauth', false ); $SMTPUSERNAME = OC_Config::getValue( 'mail_smtpname', '' ); $SMTPPASSWORD = OC_Config::getValue( 'mail_smtppassword', '' ); @@ -49,6 +55,7 @@ class OC_Mail { $mailo->Host = $SMTPHOST; + $mailo->Port = $SMTPPORT; $mailo->SMTPAuth = $SMTPAUTH; $mailo->Username = $SMTPUSERNAME; $mailo->Password = $SMTPPASSWORD; @@ -89,8 +96,6 @@ class OC_Mail { } } - - /** * return the footer for a mail * @@ -103,7 +108,4 @@ class OC_Mail { return($txt); } - - - } -- cgit v1.2.3 From 3bcdd8c90056d4143b0f2e6794aca3c5e6656557 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Thu, 3 Jan 2013 00:05:19 +0100 Subject: [tx-robot] updated from transifex --- apps/files/l10n/bn_BD.php | 46 +++ apps/files_external/l10n/bn_BD.php | 6 + apps/files_sharing/l10n/bn_BD.php | 6 + apps/files_versions/l10n/bn_BD.php | 3 + apps/user_ldap/l10n/bn_BD.php | 4 + core/l10n/bn_BD.php | 121 ++++++++ l10n/bn_BD/core.po | 245 +++++++-------- l10n/bn_BD/files.po | 107 +++---- l10n/bn_BD/files_external.po | 10 +- l10n/bn_BD/files_sharing.po | 10 +- l10n/bn_BD/files_versions.po | 4 +- l10n/bn_BD/lib.po | 34 +-- l10n/bn_BD/settings.po | 95 +++--- l10n/bn_BD/user_ldap.po | 6 +- l10n/da/settings.po | 16 +- l10n/hu/core.po | 579 ++++++++++++++++++++++++++++++++++++ l10n/hu/files.po | 266 +++++++++++++++++ l10n/hu/files_encryption.po | 34 +++ l10n/hu/files_external.po | 120 ++++++++ l10n/hu/files_sharing.po | 48 +++ l10n/hu/files_versions.po | 42 +++ l10n/hu/lib.po | 152 ++++++++++ l10n/hu/settings.po | 271 +++++++++++++++++ l10n/hu/user_ldap.po | 183 ++++++++++++ l10n/hu/user_webdavauth.po | 29 ++ l10n/pt_PT/settings.po | 16 +- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 14 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- lib/l10n/bn_BD.php | 18 ++ settings/l10n/bn_BD.php | 46 +++ settings/l10n/da.php | 4 + settings/l10n/pt_PT.php | 4 + 40 files changed, 2271 insertions(+), 286 deletions(-) create mode 100644 apps/files/l10n/bn_BD.php create mode 100644 apps/files_external/l10n/bn_BD.php create mode 100644 apps/files_sharing/l10n/bn_BD.php create mode 100644 apps/files_versions/l10n/bn_BD.php create mode 100644 apps/user_ldap/l10n/bn_BD.php create mode 100644 core/l10n/bn_BD.php create mode 100644 l10n/hu/core.po create mode 100644 l10n/hu/files.po create mode 100644 l10n/hu/files_encryption.po create mode 100644 l10n/hu/files_external.po create mode 100644 l10n/hu/files_sharing.po create mode 100644 l10n/hu/files_versions.po create mode 100644 l10n/hu/lib.po create mode 100644 l10n/hu/settings.po create mode 100644 l10n/hu/user_ldap.po create mode 100644 l10n/hu/user_webdavauth.po create mode 100644 lib/l10n/bn_BD.php create mode 100644 settings/l10n/bn_BD.php (limited to 'lib') diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php new file mode 100644 index 00000000000..45cf1c2313d --- /dev/null +++ b/apps/files/l10n/bn_BD.php @@ -0,0 +1,46 @@ + "কোন সমস্যা নেই, ফাইল আপলোড সুসম্পন্ন হয়েছে", +"The uploaded file was only partially uploaded" => "আপলোড করা ফাইলটি আংশিক আপলোড হয়েছে", +"No file was uploaded" => "কোন ফাইল আপলোড করা হয় নি", +"Missing a temporary folder" => "অস্থায়ী ফোল্ডারটি খোয়া গিয়েছে ", +"Failed to write to disk" => "ডিস্কে লিখতে পারা গেল না", +"Files" => "ফাইল", +"Unshare" => "ভাগাভাগি বাতিল", +"Delete" => "মুছে ফেল", +"Rename" => "পূনঃনামকরণ", +"{new_name} already exists" => "{new_name} টি বিদ্যমান", +"replace" => "প্রতিস্থাপন", +"suggest name" => "নাম সুপারিশ কর", +"cancel" => "বাতিল", +"replaced {new_name}" => "{new_name} প্রতিস্থাপন করা হয়েছে", +"undo" => "ক্রিয়া প্রত্যাহার", +"replaced {new_name} with {old_name}" => "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে", +"unshared {files}" => "{files} ভাগাভাগি বাতিল কর", +"deleted {files}" => "{files} মুছে ফেলা হয়েছে", +"Upload Error" => "আপলোড করতে সমস্যা", +"Pending" => "মুলতুবি", +"1 file uploading" => "১ টি ফাইল আপলোড করা হচ্ছে", +"Upload cancelled." => "আপলোড বাতিল করা হয়েছে ।", +"error while scanning" => "স্ক্যান করার সময় সমস্যা দেখা দিয়েছে", +"Name" => "নাম", +"Size" => "আকার", +"Modified" => "পরিবর্তিত", +"File handling" => "ফাইল হ্যান্ডলিং", +"Maximum upload size" => "আপলোডের সর্বোচ্চ আকার", +"max. possible: " => "সম্ভাব্য সর্বোচ্চঃ", +"Needed for multi-file and folder downloads." => "একাধিক ফাইল এবং ফোল্ডার ডাউনলোড করার ক্ষেত্রে আবশ্যক।", +"Enable ZIP-download" => "জিপ ডাউনলোড সক্রিয় কর", +"0 is unlimited" => "০ এর অর্থ হলো অসীম", +"Maximum input size for ZIP files" => "জিপ ফাইলের জন্য সর্বোচ্চ ইনপুট", +"Save" => "সংরক্ষণ কর", +"New" => "নতুন", +"Text file" => "টেক্সট ফাইল", +"Folder" => "ফোল্ডার", +"Upload" => "আপলোড", +"Cancel upload" => "আপলোড বাতিল কর", +"Nothing in here. Upload something!" => "এখানে কোন কিছুই নেই। কিছু আপলোড করুন !", +"Download" => "ডাউনলোড", +"Upload too large" => "আপলোডের আকার অনেক বড়", +"Files are being scanned, please wait." => "ফাইল স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।", +"Current scanning" => "বর্তমান স্ক্যানিং" +); diff --git a/apps/files_external/l10n/bn_BD.php b/apps/files_external/l10n/bn_BD.php new file mode 100644 index 00000000000..ad983b52e43 --- /dev/null +++ b/apps/files_external/l10n/bn_BD.php @@ -0,0 +1,6 @@ + "প্রশাসক", +"Groups" => "গোষ্ঠী", +"Users" => "ব্যবহারকারিবৃন্দ", +"Delete" => "মুছে ফেল" +); diff --git a/apps/files_sharing/l10n/bn_BD.php b/apps/files_sharing/l10n/bn_BD.php new file mode 100644 index 00000000000..785dfcd2f1d --- /dev/null +++ b/apps/files_sharing/l10n/bn_BD.php @@ -0,0 +1,6 @@ + "কূটশব্দ", +"Submit" => "পাঠাও", +"Download" => "ডাউনলোড", +"web services under your control" => "ওয়েব সেবাসমূহ এখন আপনার হাতের মুঠোয়" +); diff --git a/apps/files_versions/l10n/bn_BD.php b/apps/files_versions/l10n/bn_BD.php new file mode 100644 index 00000000000..d44ea131313 --- /dev/null +++ b/apps/files_versions/l10n/bn_BD.php @@ -0,0 +1,3 @@ + "সক্রিয়" +); diff --git a/apps/user_ldap/l10n/bn_BD.php b/apps/user_ldap/l10n/bn_BD.php new file mode 100644 index 00000000000..eca40c171f8 --- /dev/null +++ b/apps/user_ldap/l10n/bn_BD.php @@ -0,0 +1,4 @@ + "কূটশব্দ", +"Help" => "সহায়িকা" +); diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php new file mode 100644 index 00000000000..a3350761386 --- /dev/null +++ b/core/l10n/bn_BD.php @@ -0,0 +1,121 @@ + "%s নামের ব্যবহারকারি আপনার সাথে একটা ফাইল ভাগাভাগি করেছেন", +"User %s shared a folder with you" => "%s নামের ব্যবহারকারি আপনার সাথে একটা ফোল্ডার ভাগাভাগি করেছেন", +"Category type not provided." => "ক্যাটেগরির ধরণটি প্রদান করা হয় নি।", +"No category to add?" => "যোগ করার মত কোন ক্যাটেগরি নেই ?", +"This category already exists: " => "এই ক্যাটেগরিটি বিদ্যমানঃ", +"Object type not provided." => "অবজেক্টের ধরণটি প্রদান করা হয় নি।", +"Error adding %s to favorites." => "প্রিয়তে %s যোগ করতে সমস্যা দেখা দিয়েছে।", +"No categories selected for deletion." => "মুছে ফেলার জন্য কোন ক্যাটেগরি নির্বাচন করা হয় নি।", +"Error removing %s from favorites." => "প্রিয় থেকে %s সরিয়ে ফেলতে সমস্যা দেখা দিয়েছে।", +"Settings" => "নিয়ামকসমূহ", +"seconds ago" => "সেকেন্ড পূর্বে", +"1 minute ago" => "1 মিনিট পূর্বে", +"{minutes} minutes ago" => "{minutes} মিনিট পূর্বে", +"1 hour ago" => "1 ঘন্টা পূর্বে", +"{hours} hours ago" => "{hours} ঘন্টা পূর্বে", +"today" => "আজ", +"yesterday" => "গতকাল", +"{days} days ago" => "{days} দিন পূর্বে", +"last month" => "গতমাস", +"{months} months ago" => "{months} মাস পূর্বে", +"months ago" => "মাস পূর্বে", +"last year" => "গত বছর", +"years ago" => "বছর পূর্বে", +"Choose" => "নির্বাচন", +"Cancel" => "বাতিল", +"No" => "না", +"Yes" => "হ্যাঁ", +"Ok" => "তথাস্তু", +"The object type is not specified." => "অবজেক্টের ধরণটি সুনির্দিষ্ট নয়।", +"Error" => "সমস্যা", +"The app name is not specified." => "অ্যাপের নামটি সুনির্দিষ্ট নয়।", +"The required file {file} is not installed!" => "আবশ্যিক {file} টি সংস্থাপিত নেই !", +"Error while sharing" => "ভাগাভাগি করার সময় সমস্যা দেখা দিয়েছে", +"Error while unsharing" => "ভাগাভাগি বাতিল করার সময় সমস্যা দেখা দিয়েছে", +"Error while changing permissions" => "অনুমতি পরিবর্তন করার সময় সমস্যা দেখা দিয়েছে", +"Share with" => "যাদের সাথে ভাগাভাগি করবে", +"Share with link" => "লিংক সহযোগে ভাগাভাগি", +"Password protect" => "কূটশব্দদ্বারা সুরক্ষিত", +"Password" => "কূটশব্দ", +"Email link to person" => "ব্যক্তির সাথে ই-মেইল যুক্ত কর", +"Send" => "পাঠাও", +"Set expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন", +"Expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ", +"Share via email:" => "ই-মেইলের মাধ্যমে ভাগাভাগি করঃ", +"No people found" => "কোন ব্যক্তি খুঁজে পাওয়া গেল না", +"Resharing is not allowed" => "পূনরায় ভাগাভাগি করার অনুমতি নেই", +"Unshare" => "ভাগাভাগি বাতিল", +"can edit" => "সম্পাদনা করতে পারবে", +"access control" => "অধিগম্যতার নিয়ন্ত্রণ", +"create" => "তৈরি কর", +"update" => "পরিবর্ধন কর", +"delete" => "মুছে ফেল", +"share" => "ভাগাভাগি কর", +"Password protected" => "কূটশব্দদ্বারা সুরক্ষিত", +"Error unsetting expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা", +"Error setting expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা", +"Sending ..." => "পাঠানো হচ্ছে......", +"Email sent" => "ই-মেইল পাঠানো হয়েছে", +"ownCloud password reset" => "ownCloud কূটশব্দ পূনঃনির্ধারণ", +"Use the following link to reset your password: {link}" => "কূটশব্দ পূনঃনির্ধারণ করতে নিম্নোক্ত লিংকে ক্লিক করুন:{link}", +"You will receive a link to reset your password via Email." => "কূটশব্দ পূনঃনির্ধারণের জন্য একটি লিংক ই-মেইলের মাধ্যমে পাঠানো হয়েছে।", +"Reset email send." => "পূনঃনির্ধারণ ই-মেইল পাঠানো হয়েছে।", +"Request failed!" => "অনুরোধ ব্যর্থ !", +"Username" => "ব্যবহারকারি", +"Request reset" => "পূনঃনির্ধারণের জন্য অনুরোধ", +"Your password was reset" => "আপনার কূটশব্দটি পূনঃনির্ধারণ করা হয়েছে", +"To login page" => "প্রবেশ পাতায়", +"New password" => "নতুন কূটশব্দ", +"Reset password" => "কূটশব্দ পূনঃনির্ধারণ", +"Personal" => "ব্যক্তিগত", +"Users" => "ব্যবহারকারিবৃন্দ", +"Apps" => "অ্যাপস", +"Admin" => "প্রশাসক", +"Help" => "সহায়িকা", +"Access forbidden" => "অধিগমনের অনুমতি নেই", +"Cloud not found" => "ক্লাউড খুঁজে পাওয়া গেল না", +"Edit categories" => "ক্যাটেগরি সম্পাদনা", +"Add" => "যোগ কর", +"Security Warning" => "নিরাপত্তাজনিত সতর্কতা", +"Create an admin account" => "প্রশাসক একাউন্ট তৈরি কর", +"Advanced" => "সুচারু", +"Data folder" => "ডাটা ফোল্ডার", +"Configure the database" => "ডাটাবেজ কনফিগার কর", +"will be used" => "ব্যবহৃত হবে", +"Database user" => "ডাটাবেজ ব্যবহারকারি", +"Database password" => "ডাটাবেজ কূটশব্দ", +"Database name" => "ডাটাবেজের নাম", +"Database tablespace" => "ডাটাবেজ টেবিলস্পেস", +"Database host" => "ডাটাবেজ হোস্ট", +"Finish setup" => "সেট-আপ সুসম্পন্ন কর", +"Sunday" => "রবিবার", +"Monday" => "সোমবার", +"Tuesday" => "মঙ্গলবার", +"Wednesday" => "বুধবার", +"Thursday" => "বৃহষ্পতিবার", +"Friday" => "শুক্রবার", +"Saturday" => "শনিবার", +"January" => "জানুয়ারি", +"February" => "ফেব্রুয়ারি", +"March" => "মার্চ", +"April" => "এপ্রিল", +"May" => "মে", +"June" => "জুন", +"July" => "জুলাই", +"August" => "অগাস্ট", +"September" => "সেপ্টেম্বর", +"October" => "অক্টোবর", +"November" => "নভেম্বর", +"December" => "ডিসেম্বর", +"web services under your control" => "ওয়েব সেবাসমূহ এখন আপনার হাতের মুঠোয়", +"Log out" => "প্রস্থান", +"Lost your password?" => "আপনার কূটশব্দটি হারিয়েছেন ?", +"remember" => "মনে রাখ", +"Log in" => "প্রবেশ", +"You are logged out." => "আপনি প্রস্থান করেছেন", +"prev" => "পূর্ববর্তী", +"next" => "পরবর্তী", +"Security Warning!" => "নিরাপত্তাবিষয়ক সতর্কবাণী", +"Verify" => "যাচাই কর" +); diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po index 6d8b387d60c..76af85b64d8 100644 --- a/l10n/bn_BD/core.po +++ b/l10n/bn_BD/core.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Shubhra Paul , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-01-02 00:04+0100\n" -"PO-Revision-Date: 2011-07-25 16:05+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2013-01-03 00:04+0100\n" +"PO-Revision-Date: 2013-01-02 09:32+0000\n" +"Last-Translator: Shubhra Paul \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,12 +21,12 @@ msgstr "" #: ajax/share.php:84 #, php-format msgid "User %s shared a file with you" -msgstr "" +msgstr "%s নামের ব্যবহারকারি আপনার সাথে একটা ফাইল ভাগাভাগি করেছেন" #: ajax/share.php:86 #, php-format msgid "User %s shared a folder with you" -msgstr "" +msgstr "%s নামের ব্যবহারকারি আপনার সাথে একটা ফোল্ডার ভাগাভাগি করেছেন" #: ajax/share.php:88 #, php-format @@ -43,21 +44,21 @@ msgstr "" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." -msgstr "" +msgstr "ক্যাটেগরির ধরণটি প্রদান করা হয় নি।" #: ajax/vcategories/add.php:30 msgid "No category to add?" -msgstr "" +msgstr "যোগ করার মত কোন ক্যাটেগরি নেই ?" #: ajax/vcategories/add.php:37 msgid "This category already exists: " -msgstr "" +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 "" +msgstr "অবজেক্টের ধরণটি প্রদান করা হয় নি।" #: ajax/vcategories/addToFavorites.php:30 #: ajax/vcategories/removeFromFavorites.php:30 @@ -68,123 +69,123 @@ msgstr "" #: ajax/vcategories/addToFavorites.php:35 #, php-format msgid "Error adding %s to favorites." -msgstr "" +msgstr "প্রিয়তে %s যোগ করতে সমস্যা দেখা দিয়েছে।" #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 msgid "No categories selected for deletion." -msgstr "" +msgstr "মুছে ফেলার জন্য কোন ক্যাটেগরি নির্বাচন করা হয় নি।" #: ajax/vcategories/removeFromFavorites.php:35 #, php-format msgid "Error removing %s from favorites." -msgstr "" +msgstr "প্রিয় থেকে %s সরিয়ে ফেলতে সমস্যা দেখা দিয়েছে।" #: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61 msgid "Settings" -msgstr "" +msgstr "নিয়ামকসমূহ" #: js/js.js:704 msgid "seconds ago" -msgstr "" +msgstr "সেকেন্ড পূর্বে" #: js/js.js:705 msgid "1 minute ago" -msgstr "" +msgstr "1 মিনিট পূর্বে" #: js/js.js:706 msgid "{minutes} minutes ago" -msgstr "" +msgstr "{minutes} মিনিট পূর্বে" #: js/js.js:707 msgid "1 hour ago" -msgstr "" +msgstr "1 ঘন্টা পূর্বে" #: js/js.js:708 msgid "{hours} hours ago" -msgstr "" +msgstr "{hours} ঘন্টা পূর্বে" #: js/js.js:709 msgid "today" -msgstr "" +msgstr "আজ" #: js/js.js:710 msgid "yesterday" -msgstr "" +msgstr "গতকাল" #: js/js.js:711 msgid "{days} days ago" -msgstr "" +msgstr "{days} দিন পূর্বে" #: js/js.js:712 msgid "last month" -msgstr "" +msgstr "গতমাস" #: js/js.js:713 msgid "{months} months ago" -msgstr "" +msgstr "{months} মাস পূর্বে" #: js/js.js:714 msgid "months ago" -msgstr "" +msgstr "মাস পূর্বে" #: js/js.js:715 msgid "last year" -msgstr "" +msgstr "গত বছর" #: js/js.js:716 msgid "years ago" -msgstr "" +msgstr "বছর পূর্বে" #: js/oc-dialogs.js:126 msgid "Choose" -msgstr "" +msgstr "নির্বাচন" #: js/oc-dialogs.js:146 js/oc-dialogs.js:166 msgid "Cancel" -msgstr "" +msgstr "বাতিল" #: js/oc-dialogs.js:162 msgid "No" -msgstr "" +msgstr "না" #: js/oc-dialogs.js:163 msgid "Yes" -msgstr "" +msgstr "হ্যাঁ" #: js/oc-dialogs.js:180 msgid "Ok" -msgstr "" +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 "" +msgstr "অবজেক্টের ধরণটি সুনির্দিষ্ট নয়।" #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 #: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554 #: js/share.js:566 msgid "Error" -msgstr "" +msgstr "সমস্যা" #: js/oc-vcategories.js:179 msgid "The app name is not specified." -msgstr "" +msgstr "অ্যাপের নামটি সুনির্দিষ্ট নয়।" #: js/oc-vcategories.js:194 msgid "The required file {file} is not installed!" -msgstr "" +msgstr "আবশ্যিক {file} টি সংস্থাপিত নেই !" #: js/share.js:124 js/share.js:594 msgid "Error while sharing" -msgstr "" +msgstr "ভাগাভাগি করার সময় সমস্যা দেখা দিয়েছে" #: js/share.js:135 msgid "Error while unsharing" -msgstr "" +msgstr "ভাগাভাগি বাতিল করার সময় সমস্যা দেখা দিয়েছে" #: js/share.js:142 msgid "Error while changing permissions" -msgstr "" +msgstr "অনুমতি পরিবর্তন করার সময় সমস্যা দেখা দিয়েছে" #: js/share.js:151 msgid "Shared with you and the group {group} by {owner}" @@ -196,48 +197,48 @@ msgstr "" #: js/share.js:158 msgid "Share with" -msgstr "" +msgstr "যাদের সাথে ভাগাভাগি করবে" #: js/share.js:163 msgid "Share with link" -msgstr "" +msgstr "লিংক সহযোগে ভাগাভাগি" #: js/share.js:166 msgid "Password protect" -msgstr "" +msgstr "কূটশব্দদ্বারা সুরক্ষিত" #: js/share.js:168 templates/installation.php:44 templates/login.php:35 #: templates/verify.php:13 msgid "Password" -msgstr "" +msgstr "কূটশব্দ" #: js/share.js:172 msgid "Email link to person" -msgstr "" +msgstr "ব্যক্তির সাথে ই-মেইল যুক্ত কর" #: js/share.js:173 msgid "Send" -msgstr "" +msgstr "পাঠাও" #: js/share.js:177 msgid "Set expiration date" -msgstr "" +msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন" #: js/share.js:178 msgid "Expiration date" -msgstr "" +msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ" #: js/share.js:210 msgid "Share via email:" -msgstr "" +msgstr "ই-মেইলের মাধ্যমে ভাগাভাগি করঃ" #: js/share.js:212 msgid "No people found" -msgstr "" +msgstr "কোন ব্যক্তি খুঁজে পাওয়া গেল না" #: js/share.js:239 msgid "Resharing is not allowed" -msgstr "" +msgstr "পূনরায় ভাগাভাগি করার অনুমতি নেই" #: js/share.js:275 msgid "Shared in {item} with {user}" @@ -245,136 +246,136 @@ msgstr "" #: js/share.js:296 msgid "Unshare" -msgstr "" +msgstr "ভাগাভাগি বাতিল" #: js/share.js:308 msgid "can edit" -msgstr "" +msgstr "সম্পাদনা করতে পারবে" #: js/share.js:310 msgid "access control" -msgstr "" +msgstr "অধিগম্যতার নিয়ন্ত্রণ" #: js/share.js:313 msgid "create" -msgstr "" +msgstr "তৈরি কর" #: js/share.js:316 msgid "update" -msgstr "" +msgstr "পরিবর্ধন কর" #: js/share.js:319 msgid "delete" -msgstr "" +msgstr "মুছে ফেল" #: js/share.js:322 msgid "share" -msgstr "" +msgstr "ভাগাভাগি কর" #: js/share.js:356 js/share.js:541 msgid "Password protected" -msgstr "" +msgstr "কূটশব্দদ্বারা সুরক্ষিত" #: js/share.js:554 msgid "Error unsetting expiration date" -msgstr "" +msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা" #: js/share.js:566 msgid "Error setting expiration date" -msgstr "" +msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা" #: js/share.js:581 msgid "Sending ..." -msgstr "" +msgstr "পাঠানো হচ্ছে......" #: js/share.js:592 msgid "Email sent" -msgstr "" +msgstr "ই-মেইল পাঠানো হয়েছে" #: lostpassword/controller.php:47 msgid "ownCloud password reset" -msgstr "" +msgstr "ownCloud কূটশব্দ পূনঃনির্ধারণ" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" -msgstr "" +msgstr "কূটশব্দ পূনঃনির্ধারণ করতে নিম্নোক্ত লিংকে ক্লিক করুন:{link}" #: lostpassword/templates/lostpassword.php:3 msgid "You will receive a link to reset your password via Email." -msgstr "" +msgstr "কূটশব্দ পূনঃনির্ধারণের জন্য একটি লিংক ই-মেইলের মাধ্যমে পাঠানো হয়েছে।" #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "পূনঃনির্ধারণ ই-মেইল পাঠানো হয়েছে।" #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "অনুরোধ ব্যর্থ !" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 #: templates/login.php:28 msgid "Username" -msgstr "" +msgstr "ব্যবহারকারি" #: lostpassword/templates/lostpassword.php:14 msgid "Request reset" -msgstr "" +msgstr "পূনঃনির্ধারণের জন্য অনুরোধ" #: lostpassword/templates/resetpassword.php:4 msgid "Your password was reset" -msgstr "" +msgstr "আপনার কূটশব্দটি পূনঃনির্ধারণ করা হয়েছে" #: lostpassword/templates/resetpassword.php:5 msgid "To login page" -msgstr "" +msgstr "প্রবেশ পাতায়" #: lostpassword/templates/resetpassword.php:8 msgid "New password" -msgstr "" +msgstr "নতুন কূটশব্দ" #: lostpassword/templates/resetpassword.php:11 msgid "Reset password" -msgstr "" +msgstr "কূটশব্দ পূনঃনির্ধারণ" #: strings.php:5 msgid "Personal" -msgstr "" +msgstr "ব্যক্তিগত" #: strings.php:6 msgid "Users" -msgstr "" +msgstr "ব্যবহারকারিবৃন্দ" #: strings.php:7 msgid "Apps" -msgstr "" +msgstr "অ্যাপস" #: strings.php:8 msgid "Admin" -msgstr "" +msgstr "প্রশাসক" #: strings.php:9 msgid "Help" -msgstr "" +msgstr "সহায়িকা" #: templates/403.php:12 msgid "Access forbidden" -msgstr "" +msgstr "অধিগমনের অনুমতি নেই" #: templates/404.php:12 msgid "Cloud not found" -msgstr "" +msgstr "ক্লাউড খুঁজে পাওয়া গেল না" #: templates/edit_categories_dialog.php:4 msgid "Edit categories" -msgstr "" +msgstr "ক্যাটেগরি সম্পাদনা" #: templates/edit_categories_dialog.php:16 msgid "Add" -msgstr "" +msgstr "যোগ কর" #: templates/installation.php:23 templates/installation.php:31 msgid "Security Warning" -msgstr "" +msgstr "নিরাপত্তাজনিত সতর্কতা" #: templates/installation.php:24 msgid "" @@ -399,132 +400,132 @@ msgstr "" #: templates/installation.php:36 msgid "Create an admin account" -msgstr "" +msgstr "প্রশাসক একাউন্ট তৈরি কর" #: templates/installation.php:50 msgid "Advanced" -msgstr "" +msgstr "সুচারু" #: templates/installation.php:52 msgid "Data folder" -msgstr "" +msgstr "ডাটা ফোল্ডার" #: templates/installation.php:59 msgid "Configure the database" -msgstr "" +msgstr "ডাটাবেজ কনফিগার কর" #: templates/installation.php:64 templates/installation.php:75 #: templates/installation.php:85 templates/installation.php:95 msgid "will be used" -msgstr "" +msgstr "ব্যবহৃত হবে" #: templates/installation.php:107 msgid "Database user" -msgstr "" +msgstr "ডাটাবেজ ব্যবহারকারি" #: templates/installation.php:111 msgid "Database password" -msgstr "" +msgstr "ডাটাবেজ কূটশব্দ" #: templates/installation.php:115 msgid "Database name" -msgstr "" +msgstr "ডাটাবেজের নাম" #: templates/installation.php:123 msgid "Database tablespace" -msgstr "" +msgstr "ডাটাবেজ টেবিলস্পেস" #: templates/installation.php:129 msgid "Database host" -msgstr "" +msgstr "ডাটাবেজ হোস্ট" #: templates/installation.php:134 msgid "Finish setup" -msgstr "" +msgstr "সেট-আপ সুসম্পন্ন কর" #: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Sunday" -msgstr "" +msgstr "রবিবার" #: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Monday" -msgstr "" +msgstr "সোমবার" #: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Tuesday" -msgstr "" +msgstr "মঙ্গলবার" #: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Wednesday" -msgstr "" +msgstr "বুধবার" #: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Thursday" -msgstr "" +msgstr "বৃহষ্পতিবার" #: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Friday" -msgstr "" +msgstr "শুক্রবার" #: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Saturday" -msgstr "" +msgstr "শনিবার" #: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "January" -msgstr "" +msgstr "জানুয়ারি" #: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "February" -msgstr "" +msgstr "ফেব্রুয়ারি" #: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "March" -msgstr "" +msgstr "মার্চ" #: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "April" -msgstr "" +msgstr "এপ্রিল" #: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "May" -msgstr "" +msgstr "মে" #: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "June" -msgstr "" +msgstr "জুন" #: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "July" -msgstr "" +msgstr "জুলাই" #: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "August" -msgstr "" +msgstr "অগাস্ট" #: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "September" -msgstr "" +msgstr "সেপ্টেম্বর" #: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "October" -msgstr "" +msgstr "অক্টোবর" #: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "November" -msgstr "" +msgstr "নভেম্বর" #: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "December" -msgstr "" +msgstr "ডিসেম্বর" #: templates/layout.guest.php:42 msgid "web services under your control" -msgstr "" +msgstr "ওয়েব সেবাসমূহ এখন আপনার হাতের মুঠোয়" #: templates/layout.user.php:45 msgid "Log out" -msgstr "" +msgstr "প্রস্থান" #: templates/login.php:10 msgid "Automatic logon rejected!" @@ -542,31 +543,31 @@ msgstr "" #: templates/login.php:19 msgid "Lost your password?" -msgstr "" +msgstr "আপনার কূটশব্দটি হারিয়েছেন ?" #: templates/login.php:39 msgid "remember" -msgstr "" +msgstr "মনে রাখ" #: templates/login.php:41 msgid "Log in" -msgstr "" +msgstr "প্রবেশ" #: templates/logout.php:1 msgid "You are logged out." -msgstr "" +msgstr "আপনি প্রস্থান করেছেন" #: templates/part.pagenavi.php:3 msgid "prev" -msgstr "" +msgstr "পূর্ববর্তী" #: templates/part.pagenavi.php:20 msgid "next" -msgstr "" +msgstr "পরবর্তী" #: templates/verify.php:5 msgid "Security Warning!" -msgstr "" +msgstr "নিরাপত্তাবিষয়ক সতর্কবাণী" #: templates/verify.php:6 msgid "" @@ -576,4 +577,4 @@ msgstr "" #: templates/verify.php:16 msgid "Verify" -msgstr "" +msgstr "যাচাই কর" diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po index 9b718fe76c4..8982ada4875 100644 --- a/l10n/bn_BD/files.po +++ b/l10n/bn_BD/files.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Shubhra Paul , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-01-02 00:04+0100\n" -"PO-Revision-Date: 2011-08-13 02:19+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2013-01-03 00:04+0100\n" +"PO-Revision-Date: 2013-01-02 10:06+0000\n" +"Last-Translator: Shubhra Paul \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgstr "" #: ajax/upload.php:20 msgid "There is no error, the file uploaded with success" -msgstr "" +msgstr "কোন সমস্যা নেই, ফাইল আপলোড সুসম্পন্ন হয়েছে" #: ajax/upload.php:21 msgid "" @@ -34,71 +35,71 @@ msgstr "" #: ajax/upload.php:25 msgid "The uploaded file was only partially uploaded" -msgstr "" +msgstr "আপলোড করা ফাইলটি আংশিক আপলোড হয়েছে" #: ajax/upload.php:26 msgid "No file was uploaded" -msgstr "" +msgstr "কোন ফাইল আপলোড করা হয় নি" #: ajax/upload.php:27 msgid "Missing a temporary folder" -msgstr "" +msgstr "অস্থায়ী ফোল্ডারটি খোয়া গিয়েছে " #: ajax/upload.php:28 msgid "Failed to write to disk" -msgstr "" +msgstr "ডিস্কে লিখতে পারা গেল না" #: appinfo/app.php:10 msgid "Files" -msgstr "" +msgstr "ফাইল" #: js/fileactions.js:117 templates/index.php:84 templates/index.php:85 msgid "Unshare" -msgstr "" +msgstr "ভাগাভাগি বাতিল" #: js/fileactions.js:119 templates/index.php:90 templates/index.php:91 msgid "Delete" -msgstr "" +msgstr "মুছে ফেল" #: js/fileactions.js:181 msgid "Rename" -msgstr "" +msgstr "পূনঃনামকরণ" #: js/filelist.js:199 js/filelist.js:201 msgid "{new_name} already exists" -msgstr "" +msgstr "{new_name} টি বিদ্যমান" #: js/filelist.js:199 js/filelist.js:201 msgid "replace" -msgstr "" +msgstr "প্রতিস্থাপন" #: js/filelist.js:199 msgid "suggest name" -msgstr "" +msgstr "নাম সুপারিশ কর" #: js/filelist.js:199 js/filelist.js:201 msgid "cancel" -msgstr "" +msgstr "বাতিল" #: js/filelist.js:248 msgid "replaced {new_name}" -msgstr "" +msgstr "{new_name} প্রতিস্থাপন করা হয়েছে" #: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284 msgid "undo" -msgstr "" +msgstr "ক্রিয়া প্রত্যাহার" #: js/filelist.js:250 msgid "replaced {new_name} with {old_name}" -msgstr "" +msgstr "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে" #: js/filelist.js:282 msgid "unshared {files}" -msgstr "" +msgstr "{files} ভাগাভাগি বাতিল কর" #: js/filelist.js:284 msgid "deleted {files}" -msgstr "" +msgstr "{files} মুছে ফেলা হয়েছে" #: js/files.js:33 msgid "" @@ -116,7 +117,7 @@ msgstr "" #: js/files.js:212 msgid "Upload Error" -msgstr "" +msgstr "আপলোড করতে সমস্যা" #: js/files.js:229 msgid "Close" @@ -124,11 +125,11 @@ msgstr "" #: js/files.js:248 js/files.js:362 js/files.js:392 msgid "Pending" -msgstr "" +msgstr "মুলতুবি" #: js/files.js:268 msgid "1 file uploading" -msgstr "" +msgstr "১ টি ফাইল আপলোড করা হচ্ছে" #: js/files.js:271 js/files.js:325 js/files.js:340 msgid "{count} files uploading" @@ -136,7 +137,7 @@ msgstr "" #: js/files.js:343 js/files.js:376 msgid "Upload cancelled." -msgstr "" +msgstr "আপলোড বাতিল করা হয়েছে ।" #: js/files.js:445 msgid "" @@ -153,19 +154,19 @@ msgstr "" #: js/files.js:707 msgid "error while scanning" -msgstr "" +msgstr "স্ক্যান করার সময় সমস্যা দেখা দিয়েছে" #: js/files.js:780 templates/index.php:66 msgid "Name" -msgstr "" +msgstr "নাম" #: js/files.js:781 templates/index.php:77 msgid "Size" -msgstr "" +msgstr "আকার" #: js/files.js:782 templates/index.php:79 msgid "Modified" -msgstr "" +msgstr "পরিবর্তিত" #: js/files.js:801 msgid "1 folder" @@ -185,47 +186,47 @@ msgstr "" #: templates/admin.php:5 msgid "File handling" -msgstr "" +msgstr "ফাইল হ্যান্ডলিং" #: templates/admin.php:7 msgid "Maximum upload size" -msgstr "" +msgstr "আপলোডের সর্বোচ্চ আকার" -#: templates/admin.php:9 +#: templates/admin.php:10 msgid "max. possible: " -msgstr "" +msgstr "সম্ভাব্য সর্বোচ্চঃ" -#: templates/admin.php:12 +#: templates/admin.php:15 msgid "Needed for multi-file and folder downloads." -msgstr "" +msgstr "একাধিক ফাইল এবং ফোল্ডার ডাউনলোড করার ক্ষেত্রে আবশ্যক।" -#: templates/admin.php:14 +#: templates/admin.php:17 msgid "Enable ZIP-download" -msgstr "" +msgstr "জিপ ডাউনলোড সক্রিয় কর" -#: templates/admin.php:17 +#: templates/admin.php:20 msgid "0 is unlimited" -msgstr "" +msgstr "০ এর অর্থ হলো অসীম" -#: templates/admin.php:19 +#: templates/admin.php:22 msgid "Maximum input size for ZIP files" -msgstr "" +msgstr "জিপ ফাইলের জন্য সর্বোচ্চ ইনপুট" -#: templates/admin.php:23 +#: templates/admin.php:26 msgid "Save" -msgstr "" +msgstr "সংরক্ষণ কর" #: templates/index.php:7 msgid "New" -msgstr "" +msgstr "নতুন" #: templates/index.php:10 msgid "Text file" -msgstr "" +msgstr "টেক্সট ফাইল" #: templates/index.php:12 msgid "Folder" -msgstr "" +msgstr "ফোল্ডার" #: templates/index.php:14 msgid "From link" @@ -233,23 +234,23 @@ msgstr "" #: templates/index.php:35 msgid "Upload" -msgstr "" +msgstr "আপলোড" #: templates/index.php:43 msgid "Cancel upload" -msgstr "" +msgstr "আপলোড বাতিল কর" #: templates/index.php:58 msgid "Nothing in here. Upload something!" -msgstr "" +msgstr "এখানে কোন কিছুই নেই। কিছু আপলোড করুন !" #: templates/index.php:72 msgid "Download" -msgstr "" +msgstr "ডাউনলোড" #: templates/index.php:104 msgid "Upload too large" -msgstr "" +msgstr "আপলোডের আকার অনেক বড়" #: templates/index.php:106 msgid "" @@ -259,8 +260,8 @@ msgstr "" #: templates/index.php:111 msgid "Files are being scanned, please wait." -msgstr "" +msgstr "ফাইল স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।" #: templates/index.php:114 msgid "Current scanning" -msgstr "" +msgstr "বর্তমান স্ক্যানিং" diff --git a/l10n/bn_BD/files_external.po b/l10n/bn_BD/files_external.po index 6b3eb164280..601f3807ce2 100644 --- a/l10n/bn_BD/files_external.po +++ b/l10n/bn_BD/files_external.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-01-02 00:04+0100\n" +"POT-Creation-Date: 2013-01-03 00:04+0100\n" "PO-Revision-Date: 2012-08-12 22:34+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" @@ -64,7 +64,7 @@ msgstr "" #: templates/settings.php:9 msgid "Backend" -msgstr "" +msgstr "প্রশাসক" #: templates/settings.php:10 msgid "Configuration" @@ -92,16 +92,16 @@ msgstr "" #: templates/settings.php:87 msgid "Groups" -msgstr "" +msgstr "গোষ্ঠী" #: templates/settings.php:95 msgid "Users" -msgstr "" +msgstr "ব্যবহারকারিবৃন্দ" #: templates/settings.php:108 templates/settings.php:109 #: templates/settings.php:144 templates/settings.php:145 msgid "Delete" -msgstr "" +msgstr "মুছে ফেল" #: templates/settings.php:124 msgid "Enable User External Storage" diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po index 28824778601..69c55d62484 100644 --- a/l10n/bn_BD/files_sharing.po +++ b/l10n/bn_BD/files_sharing.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-01-02 00:04+0100\n" +"POT-Creation-Date: 2013-01-03 00:04+0100\n" "PO-Revision-Date: 2012-08-12 22:35+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" @@ -19,11 +19,11 @@ msgstr "" #: templates/authenticate.php:4 msgid "Password" -msgstr "" +msgstr "কূটশব্দ" #: templates/authenticate.php:6 msgid "Submit" -msgstr "" +msgstr "পাঠাও" #: templates/public.php:17 #, php-format @@ -37,7 +37,7 @@ msgstr "" #: templates/public.php:22 templates/public.php:38 msgid "Download" -msgstr "" +msgstr "ডাউনলোড" #: templates/public.php:37 msgid "No preview available for" @@ -45,4 +45,4 @@ msgstr "" #: templates/public.php:43 msgid "web services under your control" -msgstr "" +msgstr "ওয়েব সেবাসমূহ এখন আপনার হাতের মুঠোয়" diff --git a/l10n/bn_BD/files_versions.po b/l10n/bn_BD/files_versions.po index 83da5456a7b..9f543cad59e 100644 --- a/l10n/bn_BD/files_versions.po +++ b/l10n/bn_BD/files_versions.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-01-02 00:04+0100\n" +"POT-Creation-Date: 2013-01-03 00:04+0100\n" "PO-Revision-Date: 2012-08-12 22:37+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" @@ -39,4 +39,4 @@ msgstr "" #: templates/settings.php:4 msgid "Enable" -msgstr "" +msgstr "সক্রিয়" diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po index 7305e997402..184ae9bb05d 100644 --- a/l10n/bn_BD/lib.po +++ b/l10n/bn_BD/lib.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-01-02 00:04+0100\n" +"POT-Creation-Date: 2013-01-03 00:04+0100\n" "PO-Revision-Date: 2012-07-27 22:23+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" @@ -19,27 +19,27 @@ msgstr "" #: app.php:287 msgid "Help" -msgstr "" +msgstr "সহায়িকা" #: app.php:294 msgid "Personal" -msgstr "" +msgstr "ব্যক্তিগত" #: app.php:299 msgid "Settings" -msgstr "" +msgstr "নিয়ামকসমূহ" #: app.php:304 msgid "Users" -msgstr "" +msgstr "ব্যবহারকারিবৃন্দ" #: app.php:311 msgid "Apps" -msgstr "" +msgstr "অ্যাপস" #: app.php:313 msgid "Admin" -msgstr "" +msgstr "প্রশাসক" #: files.php:365 msgid "ZIP download is turned off." @@ -63,7 +63,7 @@ msgstr "" #: json.php:39 json.php:64 json.php:77 json.php:89 msgid "Authentication error" -msgstr "" +msgstr "নিশ্চিতকরণে সমস্যা দেখা দিয়েছে" #: json.php:51 msgid "Token expired. Please reload page." @@ -71,7 +71,7 @@ msgstr "" #: search/provider/file.php:17 search/provider/file.php:35 msgid "Files" -msgstr "" +msgstr "ফাইল" #: search/provider/file.php:26 search/provider/file.php:33 msgid "Text" @@ -83,11 +83,11 @@ msgstr "" #: template.php:103 msgid "seconds ago" -msgstr "" +msgstr "সেকেন্ড পূর্বে" #: template.php:104 msgid "1 minute ago" -msgstr "" +msgstr "1 মিনিট পূর্বে" #: template.php:105 #, php-format @@ -96,7 +96,7 @@ msgstr "" #: template.php:106 msgid "1 hour ago" -msgstr "" +msgstr "1 ঘন্টা পূর্বে" #: template.php:107 #, php-format @@ -105,11 +105,11 @@ msgstr "" #: template.php:108 msgid "today" -msgstr "" +msgstr "আজ" #: template.php:109 msgid "yesterday" -msgstr "" +msgstr "গতকাল" #: template.php:110 #, php-format @@ -118,7 +118,7 @@ msgstr "" #: template.php:111 msgid "last month" -msgstr "" +msgstr "গতমাস" #: template.php:112 #, php-format @@ -127,11 +127,11 @@ msgstr "" #: template.php:113 msgid "last year" -msgstr "" +msgstr "গত বছর" #: template.php:114 msgid "years ago" -msgstr "" +msgstr "বছর পূর্বে" #: updater.php:75 #, php-format diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po index 414c11fbd01..de192ed72c9 100644 --- a/l10n/bn_BD/settings.po +++ b/l10n/bn_BD/settings.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Shubhra Paul , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-01-02 00:04+0100\n" -"PO-Revision-Date: 2011-07-25 16:05+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2013-01-03 00:04+0100\n" +"PO-Revision-Date: 2013-01-02 09:43+0000\n" +"Last-Translator: Shubhra Paul \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,51 +20,51 @@ msgstr "" #: ajax/apps/ocs.php:20 msgid "Unable to load list from App Store" -msgstr "" +msgstr "অ্যাপস্টোর থেকে তালিকা লোড করা সম্ভব হলো না" #: ajax/creategroup.php:10 msgid "Group already exists" -msgstr "" +msgstr "গোষ্ঠীটি বিদ্যমান" #: ajax/creategroup.php:19 msgid "Unable to add group" -msgstr "" +msgstr "গোষ্ঠী যোগ করতে পারা গেল না" #: ajax/enableapp.php:12 msgid "Could not enable app. " -msgstr "" +msgstr "অ্যাপ সক্রিয় করা সম্ভব হলো না" #: ajax/lostpassword.php:12 msgid "Email saved" -msgstr "" +msgstr "ই-মেইল সংরক্ষণ করা হয়েছে" #: ajax/lostpassword.php:14 msgid "Invalid email" -msgstr "" +msgstr "ই-মেইলটি সঠিক নয়" #: ajax/openid.php:13 msgid "OpenID Changed" -msgstr "" +msgstr "OpenID পরিবর্তন করা হয়েছে" #: ajax/openid.php:15 ajax/setlanguage.php:17 ajax/setlanguage.php:20 msgid "Invalid request" -msgstr "" +msgstr "অননুমোদিত অনুরোধ" #: ajax/removegroup.php:13 msgid "Unable to delete group" -msgstr "" +msgstr "গোষ্ঠী মুছে ফেলা সম্ভব হলো না" #: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18 msgid "Authentication error" -msgstr "" +msgstr "নিশ্চিতকরণে সমস্যা দেখা দিয়েছে" #: ajax/removeuser.php:24 msgid "Unable to delete user" -msgstr "" +msgstr "ব্যবহারকারি মুছে ফেলা সম্ভব হলো না" #: ajax/setlanguage.php:15 msgid "Language changed" -msgstr "" +msgstr "ভাষা পরিবর্তন করা হয়েছে" #: ajax/togglegroups.php:12 msgid "Admins can't remove themself from the admin group" @@ -81,39 +82,39 @@ msgstr "" #: js/apps.js:28 js/apps.js:67 msgid "Disable" -msgstr "" +msgstr "নিষ্ক্রিয়" #: js/apps.js:28 js/apps.js:55 msgid "Enable" -msgstr "" +msgstr "সক্রিয়" #: js/personal.js:69 msgid "Saving..." -msgstr "" +msgstr "সংরক্ষণ করা হচ্ছে...." #: personal.php:42 personal.php:43 msgid "__language_name__" -msgstr "" +msgstr "_ভাষার_নাম_" #: templates/apps.php:10 msgid "Add your App" -msgstr "" +msgstr "আপনার অ্যাপটি যোগ করুন" #: templates/apps.php:11 msgid "More Apps" -msgstr "" +msgstr "আরও অ্যাপ" #: templates/apps.php:27 msgid "Select an App" -msgstr "" +msgstr "অ্যাপ নির্বাচন করুন" #: templates/apps.php:31 msgid "See application page at apps.owncloud.com" -msgstr "" +msgstr "অ্যাপ্লিকেসন পাতাটি দেখুন এখানে apps.owncloud.com" #: templates/apps.php:32 msgid "-licensed by " -msgstr "" +msgstr "-লাইসেন্স করিয়েছেন " #: templates/help.php:3 msgid "User Documentation" @@ -129,15 +130,15 @@ msgstr "" #: templates/help.php:7 msgid "Forum" -msgstr "" +msgstr "ফোরাম" #: templates/help.php:9 msgid "Bugtracker" -msgstr "" +msgstr "বাগট্র্যাকার" #: templates/help.php:11 msgid "Commercial Support" -msgstr "" +msgstr "বাণিজ্যিক সাপোর্ট" #: templates/personal.php:8 #, php-format @@ -146,11 +147,11 @@ msgstr "" #: templates/personal.php:12 msgid "Clients" -msgstr "" +msgstr "ক্লায়েন্ট" #: templates/personal.php:13 msgid "Download Desktop Clients" -msgstr "" +msgstr "ডেস্কটপ ক্লায়েন্ট ডাউনলোড করুন" #: templates/personal.php:14 msgid "Download Android Client" @@ -162,39 +163,39 @@ msgstr "" #: templates/personal.php:21 templates/users.php:23 templates/users.php:82 msgid "Password" -msgstr "" +msgstr "কূটশব্দ" #: templates/personal.php:22 msgid "Your password was changed" -msgstr "" +msgstr "আপনার কূটশব্দটি পরিবর্তন করা হয়েছে" #: templates/personal.php:23 msgid "Unable to change your password" -msgstr "" +msgstr "কূটশব্দ পরিবর্তন করা সম্ভব হলো না" #: templates/personal.php:24 msgid "Current password" -msgstr "" +msgstr "বর্তমান কূটশব্দ" #: templates/personal.php:25 msgid "New password" -msgstr "" +msgstr "নতুন কূটশব্দ" #: templates/personal.php:26 msgid "show" -msgstr "" +msgstr "প্রদর্শন" #: templates/personal.php:27 msgid "Change password" -msgstr "" +msgstr "কূটশব্দ পরিবর্তন কর" #: templates/personal.php:33 msgid "Email" -msgstr "" +msgstr "ই-মেইল" #: templates/personal.php:34 msgid "Your email address" -msgstr "" +msgstr "আপনার ই-মেইল ঠিকানা" #: templates/personal.php:35 msgid "Fill in an email address to enable password recovery" @@ -202,11 +203,11 @@ msgstr "" #: templates/personal.php:41 templates/personal.php:42 msgid "Language" -msgstr "" +msgstr "ভাষা" #: templates/personal.php:47 msgid "Help translate" -msgstr "" +msgstr "অনুবাদ করতে সাহায্য করুন" #: templates/personal.php:52 msgid "WebDAV" @@ -228,19 +229,19 @@ msgid "" "licensed under the AGPL." -msgstr "" +msgstr "তৈরি করেছেন ownCloud community, যার উৎস কোড AGPLএর অধীনে লাইেসন্সকৃত." #: templates/users.php:21 templates/users.php:81 msgid "Name" -msgstr "" +msgstr "নাম" #: templates/users.php:26 templates/users.php:83 templates/users.php:103 msgid "Groups" -msgstr "" +msgstr "গোষ্ঠী" #: templates/users.php:32 msgid "Create" -msgstr "" +msgstr "তৈরি কর" #: templates/users.php:35 msgid "Default Storage" @@ -252,11 +253,11 @@ msgstr "" #: templates/users.php:60 templates/users.php:153 msgid "Other" -msgstr "" +msgstr "অন্যান্য" #: templates/users.php:85 templates/users.php:117 msgid "Group Admin" -msgstr "" +msgstr "গোষ্ঠী প্রশাসন" #: templates/users.php:87 msgid "Storage" @@ -268,4 +269,4 @@ msgstr "" #: templates/users.php:161 msgid "Delete" -msgstr "" +msgstr "মুছে ফেল" diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po index 75066d45b13..509354b9d66 100644 --- a/l10n/bn_BD/user_ldap.po +++ b/l10n/bn_BD/user_ldap.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-01-02 00:04+0100\n" +"POT-Creation-Date: 2013-01-03 00:04+0100\n" "PO-Revision-Date: 2012-08-12 22:45+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" @@ -60,7 +60,7 @@ msgstr "" #: templates/settings.php:18 msgid "Password" -msgstr "" +msgstr "কূটশব্দ" #: templates/settings.php:18 msgid "For anonymous access, leave DN and Password empty." @@ -180,4 +180,4 @@ msgstr "" #: templates/settings.php:39 msgid "Help" -msgstr "" +msgstr "সহায়িকা" diff --git a/l10n/da/settings.po b/l10n/da/settings.po index a4196d62a07..3c2c03dfdaf 100644 --- a/l10n/da/settings.po +++ b/l10n/da/settings.po @@ -10,16 +10,16 @@ # Ole Holm Frandsen , 2012. # Pascal d'Hermilly , 2011. # , 2012. -# , 2012. +# , 2012-2013. # Thomas Tanghus <>, 2012. # Thomas Tanghus , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" -"PO-Revision-Date: 2012-12-29 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-01-03 00:04+0100\n" +"PO-Revision-Date: 2013-01-02 21:06+0000\n" +"Last-Translator: ressel \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" @@ -254,11 +254,11 @@ msgstr "Ny" #: templates/users.php:35 msgid "Default Storage" -msgstr "" +msgstr "Standard opbevaring" #: templates/users.php:42 templates/users.php:138 msgid "Unlimited" -msgstr "" +msgstr "Ubegrænset" #: templates/users.php:60 templates/users.php:153 msgid "Other" @@ -270,11 +270,11 @@ msgstr "Gruppe Administrator" #: templates/users.php:87 msgid "Storage" -msgstr "" +msgstr "Opbevaring" #: templates/users.php:133 msgid "Default" -msgstr "" +msgstr "Standard" #: templates/users.php:161 msgid "Delete" diff --git a/l10n/hu/core.po b/l10n/hu/core.po new file mode 100644 index 00000000000..03c54c112f2 --- /dev/null +++ b/l10n/hu/core.po @@ -0,0 +1,579 @@ +# 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-01-03 00:04+0100\n" +"PO-Revision-Date: 2011-07-25 16:05+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/share.php:84 +#, php-format +msgid "User %s shared a file with you" +msgstr "" + +#: ajax/share.php:86 +#, php-format +msgid "User %s shared a folder with you" +msgstr "" + +#: ajax/share.php:88 +#, php-format +msgid "" +"User %s shared the file \"%s\" with you. It is available for download here: " +"%s" +msgstr "" + +#: ajax/share.php:90 +#, 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 +msgid "This category already exists: " +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/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61 +msgid "Settings" +msgstr "" + +#: js/js.js:704 +msgid "seconds ago" +msgstr "" + +#: js/js.js:705 +msgid "1 minute ago" +msgstr "" + +#: js/js.js:706 +msgid "{minutes} minutes ago" +msgstr "" + +#: js/js.js:707 +msgid "1 hour ago" +msgstr "" + +#: js/js.js:708 +msgid "{hours} hours ago" +msgstr "" + +#: js/js.js:709 +msgid "today" +msgstr "" + +#: js/js.js:710 +msgid "yesterday" +msgstr "" + +#: js/js.js:711 +msgid "{days} days ago" +msgstr "" + +#: js/js.js:712 +msgid "last month" +msgstr "" + +#: js/js.js:713 +msgid "{months} months ago" +msgstr "" + +#: js/js.js:714 +msgid "months ago" +msgstr "" + +#: js/js.js:715 +msgid "last year" +msgstr "" + +#: js/js.js:716 +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:135 js/share.js:142 js/share.js:554 +#: js/share.js:566 +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:124 js/share.js:594 +msgid "Error while sharing" +msgstr "" + +#: js/share.js:135 +msgid "Error while unsharing" +msgstr "" + +#: js/share.js:142 +msgid "Error while changing permissions" +msgstr "" + +#: js/share.js:151 +msgid "Shared with you and the group {group} by {owner}" +msgstr "" + +#: js/share.js:153 +msgid "Shared with you by {owner}" +msgstr "" + +#: js/share.js:158 +msgid "Share with" +msgstr "" + +#: js/share.js:163 +msgid "Share with link" +msgstr "" + +#: js/share.js:166 +msgid "Password protect" +msgstr "" + +#: js/share.js:168 templates/installation.php:44 templates/login.php:35 +#: templates/verify.php:13 +msgid "Password" +msgstr "" + +#: js/share.js:172 +msgid "Email link to person" +msgstr "" + +#: js/share.js:173 +msgid "Send" +msgstr "" + +#: js/share.js:177 +msgid "Set expiration date" +msgstr "" + +#: js/share.js:178 +msgid "Expiration date" +msgstr "" + +#: js/share.js:210 +msgid "Share via email:" +msgstr "" + +#: js/share.js:212 +msgid "No people found" +msgstr "" + +#: js/share.js:239 +msgid "Resharing is not allowed" +msgstr "" + +#: js/share.js:275 +msgid "Shared in {item} with {user}" +msgstr "" + +#: js/share.js:296 +msgid "Unshare" +msgstr "" + +#: js/share.js:308 +msgid "can edit" +msgstr "" + +#: js/share.js:310 +msgid "access control" +msgstr "" + +#: js/share.js:313 +msgid "create" +msgstr "" + +#: js/share.js:316 +msgid "update" +msgstr "" + +#: js/share.js:319 +msgid "delete" +msgstr "" + +#: js/share.js:322 +msgid "share" +msgstr "" + +#: js/share.js:356 js/share.js:541 +msgid "Password protected" +msgstr "" + +#: js/share.js:554 +msgid "Error unsetting expiration date" +msgstr "" + +#: js/share.js:566 +msgid "Error setting expiration date" +msgstr "" + +#: js/share.js:581 +msgid "Sending ..." +msgstr "" + +#: js/share.js:592 +msgid "Email sent" +msgstr "" + +#: lostpassword/controller.php:47 +msgid "ownCloud password reset" +msgstr "" + +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "" + +#: lostpassword/templates/lostpassword.php:3 +msgid "You will receive a link to reset your password via Email." +msgstr "" + +#: lostpassword/templates/lostpassword.php:5 +msgid "Reset email send." +msgstr "" + +#: lostpassword/templates/lostpassword.php:8 +msgid "Request failed!" +msgstr "" + +#: lostpassword/templates/lostpassword.php:11 templates/installation.php: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 "" + +#: 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:31 +msgid "Security Warning" +msgstr "" + +#: templates/installation.php:24 +msgid "" +"No secure random number generator is available, please enable the PHP " +"OpenSSL extension." +msgstr "" + +#: templates/installation.php:26 +msgid "" +"Without a secure random number generator an attacker may be able to predict " +"password reset tokens and take over your account." +msgstr "" + +#: templates/installation.php:32 +msgid "" +"Your data directory and your files are probably accessible from the " +"internet. The .htaccess file that ownCloud provides is not working. We " +"strongly suggest that you configure your webserver in a way that the data " +"directory is no longer accessible or you move the data directory outside the" +" webserver document root." +msgstr "" + +#: templates/installation.php:36 +msgid "Create an admin account" +msgstr "" + +#: templates/installation.php:50 +msgid "Advanced" +msgstr "" + +#: templates/installation.php:52 +msgid "Data folder" +msgstr "" + +#: templates/installation.php:59 +msgid "Configure the database" +msgstr "" + +#: templates/installation.php:64 templates/installation.php:75 +#: templates/installation.php:85 templates/installation.php:95 +msgid "will be used" +msgstr "" + +#: templates/installation.php:107 +msgid "Database user" +msgstr "" + +#: templates/installation.php:111 +msgid "Database password" +msgstr "" + +#: templates/installation.php:115 +msgid "Database name" +msgstr "" + +#: templates/installation.php:123 +msgid "Database tablespace" +msgstr "" + +#: templates/installation.php:129 +msgid "Database host" +msgstr "" + +#: templates/installation.php:134 +msgid "Finish setup" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "Sunday" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "Monday" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "Tuesday" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "Wednesday" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "Thursday" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "Friday" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "Saturday" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "January" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "February" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "March" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "April" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "May" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "June" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "July" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "August" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "September" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "October" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "November" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "December" +msgstr "" + +#: templates/layout.guest.php:42 +msgid "web services under your control" +msgstr "" + +#: templates/layout.user.php:45 +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:39 +msgid "remember" +msgstr "" + +#: templates/login.php:41 +msgid "Log in" +msgstr "" + +#: templates/logout.php:1 +msgid "You are logged out." +msgstr "" + +#: templates/part.pagenavi.php:3 +msgid "prev" +msgstr "" + +#: templates/part.pagenavi.php:20 +msgid "next" +msgstr "" + +#: templates/verify.php:5 +msgid "Security Warning!" +msgstr "" + +#: templates/verify.php:6 +msgid "" +"Please verify your password.
For security reasons you may be " +"occasionally asked to enter your password again." +msgstr "" + +#: templates/verify.php:16 +msgid "Verify" +msgstr "" diff --git a/l10n/hu/files.po b/l10n/hu/files.po new file mode 100644 index 00000000000..e5db30deb09 --- /dev/null +++ b/l10n/hu/files.po @@ -0,0 +1,266 @@ +# 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-01-03 00:04+0100\n" +"PO-Revision-Date: 2011-08-13 02:19+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/upload.php:20 +msgid "There is no error, the file uploaded with success" +msgstr "" + +#: ajax/upload.php:21 +msgid "" +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " +msgstr "" + +#: ajax/upload.php:23 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form" +msgstr "" + +#: ajax/upload.php:25 +msgid "The uploaded file was only partially uploaded" +msgstr "" + +#: ajax/upload.php:26 +msgid "No file was uploaded" +msgstr "" + +#: ajax/upload.php:27 +msgid "Missing a temporary folder" +msgstr "" + +#: ajax/upload.php:28 +msgid "Failed to write to disk" +msgstr "" + +#: appinfo/app.php:10 +msgid "Files" +msgstr "" + +#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91 +msgid "Delete" +msgstr "" + +#: js/fileactions.js:181 +msgid "Rename" +msgstr "" + +#: js/filelist.js:199 js/filelist.js:201 +msgid "{new_name} already exists" +msgstr "" + +#: js/filelist.js:199 js/filelist.js:201 +msgid "replace" +msgstr "" + +#: js/filelist.js:199 +msgid "suggest name" +msgstr "" + +#: js/filelist.js:199 js/filelist.js:201 +msgid "cancel" +msgstr "" + +#: js/filelist.js:248 +msgid "replaced {new_name}" +msgstr "" + +#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284 +msgid "undo" +msgstr "" + +#: js/filelist.js:250 +msgid "replaced {new_name} with {old_name}" +msgstr "" + +#: js/filelist.js:282 +msgid "unshared {files}" +msgstr "" + +#: js/filelist.js:284 +msgid "deleted {files}" +msgstr "" + +#: js/files.js:33 +msgid "" +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " +"allowed." +msgstr "" + +#: js/files.js:174 +msgid "generating ZIP-file, it may take some time." +msgstr "" + +#: js/files.js:212 +msgid "Unable to upload your file as it is a directory or has 0 bytes" +msgstr "" + +#: js/files.js:212 +msgid "Upload Error" +msgstr "" + +#: js/files.js:229 +msgid "Close" +msgstr "" + +#: js/files.js:248 js/files.js:362 js/files.js:392 +msgid "Pending" +msgstr "" + +#: js/files.js:268 +msgid "1 file uploading" +msgstr "" + +#: js/files.js:271 js/files.js:325 js/files.js:340 +msgid "{count} files uploading" +msgstr "" + +#: js/files.js:343 js/files.js:376 +msgid "Upload cancelled." +msgstr "" + +#: js/files.js:445 +msgid "" +"File upload is in progress. Leaving the page now will cancel the upload." +msgstr "" + +#: js/files.js:515 +msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" +msgstr "" + +#: js/files.js:699 +msgid "{count} files scanned" +msgstr "" + +#: js/files.js:707 +msgid "error while scanning" +msgstr "" + +#: js/files.js:780 templates/index.php:66 +msgid "Name" +msgstr "" + +#: js/files.js:781 templates/index.php:77 +msgid "Size" +msgstr "" + +#: js/files.js:782 templates/index.php:79 +msgid "Modified" +msgstr "" + +#: js/files.js:801 +msgid "1 folder" +msgstr "" + +#: js/files.js:803 +msgid "{count} folders" +msgstr "" + +#: js/files.js:811 +msgid "1 file" +msgstr "" + +#: js/files.js:813 +msgid "{count} files" +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:35 +msgid "Upload" +msgstr "" + +#: templates/index.php:43 +msgid "Cancel upload" +msgstr "" + +#: templates/index.php:58 +msgid "Nothing in here. Upload something!" +msgstr "" + +#: templates/index.php:72 +msgid "Download" +msgstr "" + +#: templates/index.php:104 +msgid "Upload too large" +msgstr "" + +#: templates/index.php:106 +msgid "" +"The files you are trying to upload exceed the maximum size for file uploads " +"on this server." +msgstr "" + +#: templates/index.php:111 +msgid "Files are being scanned, please wait." +msgstr "" + +#: templates/index.php:114 +msgid "Current scanning" +msgstr "" diff --git a/l10n/hu/files_encryption.po b/l10n/hu/files_encryption.po new file mode 100644 index 00000000000..26913fea990 --- /dev/null +++ b/l10n/hu/files_encryption.po @@ -0,0 +1,34 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-01-03 00:04+0100\n" +"PO-Revision-Date: 2012-08-12 22:33+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: templates/settings.php:3 +msgid "Encryption" +msgstr "" + +#: templates/settings.php:6 +msgid "Enable Encryption" +msgstr "" + +#: templates/settings.php:7 +msgid "None" +msgstr "" + +#: templates/settings.php:12 +msgid "Exclude the following file types from encryption" +msgstr "" diff --git a/l10n/hu/files_external.po b/l10n/hu/files_external.po new file mode 100644 index 00000000000..5ee957401ae --- /dev/null +++ b/l10n/hu/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-01-03 00:04+0100\n" +"PO-Revision-Date: 2012-08-12 22:34+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23 +msgid "Access granted" +msgstr "" + +#: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86 +msgid "Error configuring Dropbox storage" +msgstr "" + +#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40 +msgid "Grant access" +msgstr "" + +#: js/dropbox.js:73 js/google.js:72 +msgid "Fill out all required fields" +msgstr "" + +#: js/dropbox.js:85 +msgid "Please provide a valid Dropbox app key and secret." +msgstr "" + +#: js/google.js:26 js/google.js:73 js/google.js:78 +msgid "Error configuring Google Drive storage" +msgstr "" + +#: lib/config.php:434 +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:435 +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:153 +msgid "Import Root Certificate" +msgstr "" diff --git a/l10n/hu/files_sharing.po b/l10n/hu/files_sharing.po new file mode 100644 index 00000000000..07688f2047c --- /dev/null +++ b/l10n/hu/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-01-03 00:04+0100\n" +"PO-Revision-Date: 2012-08-12 22:35+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: templates/authenticate.php:4 +msgid "Password" +msgstr "" + +#: templates/authenticate.php:6 +msgid "Submit" +msgstr "" + +#: templates/public.php:17 +#, php-format +msgid "%s shared the folder %s with you" +msgstr "" + +#: templates/public.php:19 +#, php-format +msgid "%s shared the file %s with you" +msgstr "" + +#: templates/public.php:22 templates/public.php:38 +msgid "Download" +msgstr "" + +#: templates/public.php:37 +msgid "No preview available for" +msgstr "" + +#: templates/public.php:43 +msgid "web services under your control" +msgstr "" diff --git a/l10n/hu/files_versions.po b/l10n/hu/files_versions.po new file mode 100644 index 00000000000..8fb51cf6202 --- /dev/null +++ b/l10n/hu/files_versions.po @@ -0,0 +1,42 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2013-01-03 00:04+0100\n" +"PO-Revision-Date: 2012-08-12 22:37+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: js/settings-personal.js:31 templates/settings-personal.php:7 +msgid "Expire all versions" +msgstr "" + +#: js/versions.js:16 +msgid "History" +msgstr "" + +#: templates/settings-personal.php:4 +msgid "Versions" +msgstr "" + +#: templates/settings-personal.php:10 +msgid "This will delete all existing backup versions of your files" +msgstr "" + +#: templates/settings.php:3 +msgid "Files Versioning" +msgstr "" + +#: templates/settings.php:4 +msgid "Enable" +msgstr "" diff --git a/l10n/hu/lib.po b/l10n/hu/lib.po new file mode 100644 index 00000000000..0dc080f7db0 --- /dev/null +++ b/l10n/hu/lib.po @@ -0,0 +1,152 @@ +# 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-01-03 00:04+0100\n" +"PO-Revision-Date: 2012-07-27 22:23+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: app.php:287 +msgid "Help" +msgstr "" + +#: app.php:294 +msgid "Personal" +msgstr "" + +#: app.php:299 +msgid "Settings" +msgstr "" + +#: app.php:304 +msgid "Users" +msgstr "" + +#: app.php:311 +msgid "Apps" +msgstr "" + +#: app.php:313 +msgid "Admin" +msgstr "" + +#: files.php:365 +msgid "ZIP download is turned off." +msgstr "" + +#: files.php:366 +msgid "Files need to be downloaded one by one." +msgstr "" + +#: files.php:366 files.php:391 +msgid "Back to Files" +msgstr "" + +#: files.php:390 +msgid "Selected files too large to generate zip file." +msgstr "" + +#: json.php:28 +msgid "Application is not enabled" +msgstr "" + +#: json.php:39 json.php:64 json.php:77 json.php:89 +msgid "Authentication error" +msgstr "" + +#: json.php:51 +msgid "Token expired. Please reload page." +msgstr "" + +#: search/provider/file.php:17 search/provider/file.php:35 +msgid "Files" +msgstr "" + +#: search/provider/file.php:26 search/provider/file.php:33 +msgid "Text" +msgstr "" + +#: search/provider/file.php:29 +msgid "Images" +msgstr "" + +#: template.php:103 +msgid "seconds ago" +msgstr "" + +#: template.php:104 +msgid "1 minute ago" +msgstr "" + +#: template.php:105 +#, php-format +msgid "%d minutes ago" +msgstr "" + +#: template.php:106 +msgid "1 hour ago" +msgstr "" + +#: template.php:107 +#, php-format +msgid "%d hours ago" +msgstr "" + +#: template.php:108 +msgid "today" +msgstr "" + +#: template.php:109 +msgid "yesterday" +msgstr "" + +#: template.php:110 +#, php-format +msgid "%d days ago" +msgstr "" + +#: template.php:111 +msgid "last month" +msgstr "" + +#: template.php:112 +#, php-format +msgid "%d months ago" +msgstr "" + +#: template.php:113 +msgid "last year" +msgstr "" + +#: template.php:114 +msgid "years ago" +msgstr "" + +#: updater.php:75 +#, php-format +msgid "%s is available. Get more information" +msgstr "" + +#: updater.php:77 +msgid "up to date" +msgstr "" + +#: updater.php:80 +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/hu/settings.po b/l10n/hu/settings.po new file mode 100644 index 00000000000..934e419f787 --- /dev/null +++ b/l10n/hu/settings.po @@ -0,0 +1,271 @@ +# 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-01-03 00:04+0100\n" +"PO-Revision-Date: 2011-07-25 16:05+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/apps/ocs.php:20 +msgid "Unable to load list from App Store" +msgstr "" + +#: ajax/creategroup.php:10 +msgid "Group already exists" +msgstr "" + +#: ajax/creategroup.php:19 +msgid "Unable to add group" +msgstr "" + +#: ajax/enableapp.php:12 +msgid "Could not enable app. " +msgstr "" + +#: ajax/lostpassword.php:12 +msgid "Email saved" +msgstr "" + +#: ajax/lostpassword.php:14 +msgid "Invalid email" +msgstr "" + +#: ajax/openid.php:13 +msgid "OpenID Changed" +msgstr "" + +#: ajax/openid.php:15 ajax/setlanguage.php:17 ajax/setlanguage.php:20 +msgid "Invalid request" +msgstr "" + +#: ajax/removegroup.php:13 +msgid "Unable to delete group" +msgstr "" + +#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18 +msgid "Authentication error" +msgstr "" + +#: ajax/removeuser.php:24 +msgid "Unable to delete user" +msgstr "" + +#: ajax/setlanguage.php:15 +msgid "Language changed" +msgstr "" + +#: ajax/togglegroups.php: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 "" + +#: js/apps.js:28 js/apps.js:67 +msgid "Disable" +msgstr "" + +#: js/apps.js:28 js/apps.js:55 +msgid "Enable" +msgstr "" + +#: js/personal.js:69 +msgid "Saving..." +msgstr "" + +#: personal.php:42 personal.php:43 +msgid "__language_name__" +msgstr "" + +#: templates/apps.php:10 +msgid "Add your App" +msgstr "" + +#: templates/apps.php:11 +msgid "More Apps" +msgstr "" + +#: templates/apps.php:27 +msgid "Select an App" +msgstr "" + +#: templates/apps.php:31 +msgid "See application page at apps.owncloud.com" +msgstr "" + +#: templates/apps.php:32 +msgid "-licensed by " +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:12 +msgid "Clients" +msgstr "" + +#: templates/personal.php:13 +msgid "Download Desktop Clients" +msgstr "" + +#: templates/personal.php:14 +msgid "Download Android Client" +msgstr "" + +#: templates/personal.php:15 +msgid "Download iOS Client" +msgstr "" + +#: templates/personal.php:21 templates/users.php:23 templates/users.php:82 +msgid "Password" +msgstr "" + +#: templates/personal.php:22 +msgid "Your password was changed" +msgstr "" + +#: templates/personal.php:23 +msgid "Unable to change your password" +msgstr "" + +#: templates/personal.php:24 +msgid "Current password" +msgstr "" + +#: templates/personal.php:25 +msgid "New password" +msgstr "" + +#: templates/personal.php:26 +msgid "show" +msgstr "" + +#: templates/personal.php:27 +msgid "Change password" +msgstr "" + +#: templates/personal.php:33 +msgid "Email" +msgstr "" + +#: templates/personal.php:34 +msgid "Your email address" +msgstr "" + +#: templates/personal.php:35 +msgid "Fill in an email address to enable password recovery" +msgstr "" + +#: templates/personal.php:41 templates/personal.php:42 +msgid "Language" +msgstr "" + +#: templates/personal.php:47 +msgid "Help translate" +msgstr "" + +#: templates/personal.php:52 +msgid "WebDAV" +msgstr "" + +#: templates/personal.php:54 +msgid "Use this address to connect to your ownCloud in your file manager" +msgstr "" + +#: templates/personal.php:63 +msgid "Version" +msgstr "" + +#: templates/personal.php:65 +msgid "" +"Developed by the ownCloud community, the source code is " +"licensed under the AGPL." +msgstr "" + +#: templates/users.php:21 templates/users.php:81 +msgid "Name" +msgstr "" + +#: templates/users.php:26 templates/users.php:83 templates/users.php:103 +msgid "Groups" +msgstr "" + +#: templates/users.php:32 +msgid "Create" +msgstr "" + +#: templates/users.php:35 +msgid "Default Storage" +msgstr "" + +#: templates/users.php:42 templates/users.php:138 +msgid "Unlimited" +msgstr "" + +#: templates/users.php:60 templates/users.php:153 +msgid "Other" +msgstr "" + +#: templates/users.php:85 templates/users.php:117 +msgid "Group Admin" +msgstr "" + +#: templates/users.php:87 +msgid "Storage" +msgstr "" + +#: templates/users.php:133 +msgid "Default" +msgstr "" + +#: templates/users.php:161 +msgid "Delete" +msgstr "" diff --git a/l10n/hu/user_ldap.po b/l10n/hu/user_ldap.po new file mode 100644 index 00000000000..e2abecc29af --- /dev/null +++ b/l10n/hu/user_ldap.po @@ -0,0 +1,183 @@ +# 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-01-03 00:04+0100\n" +"PO-Revision-Date: 2012-08-12 22:45+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: 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 needs is not installed, the backend will" +" not work. Please ask your system administrator to install it." +msgstr "" + +#: templates/settings.php:15 +msgid "Host" +msgstr "" + +#: templates/settings.php:15 +msgid "" +"You can omit the protocol, except you require SSL. Then start with ldaps://" +msgstr "" + +#: templates/settings.php:16 +msgid "Base DN" +msgstr "" + +#: templates/settings.php:16 +msgid "You can specify Base DN for users and groups in the Advanced tab" +msgstr "" + +#: templates/settings.php:17 +msgid "User DN" +msgstr "" + +#: templates/settings.php:17 +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:18 +msgid "Password" +msgstr "" + +#: templates/settings.php:18 +msgid "For anonymous access, leave DN and Password empty." +msgstr "" + +#: templates/settings.php:19 +msgid "User Login Filter" +msgstr "" + +#: templates/settings.php:19 +#, php-format +msgid "" +"Defines the filter to apply, when login is attempted. %%uid replaces the " +"username in the login action." +msgstr "" + +#: templates/settings.php:19 +#, php-format +msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" +msgstr "" + +#: templates/settings.php:20 +msgid "User List Filter" +msgstr "" + +#: templates/settings.php:20 +msgid "Defines the filter to apply, when retrieving users." +msgstr "" + +#: templates/settings.php:20 +msgid "without any placeholder, e.g. \"objectClass=person\"." +msgstr "" + +#: templates/settings.php:21 +msgid "Group Filter" +msgstr "" + +#: templates/settings.php:21 +msgid "Defines the filter to apply, when retrieving groups." +msgstr "" + +#: templates/settings.php:21 +msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." +msgstr "" + +#: templates/settings.php:24 +msgid "Port" +msgstr "" + +#: templates/settings.php:25 +msgid "Base User Tree" +msgstr "" + +#: templates/settings.php:26 +msgid "Base Group Tree" +msgstr "" + +#: templates/settings.php:27 +msgid "Group-Member association" +msgstr "" + +#: templates/settings.php:28 +msgid "Use TLS" +msgstr "" + +#: templates/settings.php:28 +msgid "Do not use it for SSL connections, it will fail." +msgstr "" + +#: templates/settings.php:29 +msgid "Case insensitve LDAP server (Windows)" +msgstr "" + +#: templates/settings.php:30 +msgid "Turn off SSL certificate validation." +msgstr "" + +#: templates/settings.php:30 +msgid "" +"If connection only works with this option, import the LDAP server's SSL " +"certificate in your ownCloud server." +msgstr "" + +#: templates/settings.php:30 +msgid "Not recommended, use for testing only." +msgstr "" + +#: templates/settings.php:31 +msgid "User Display Name Field" +msgstr "" + +#: templates/settings.php:31 +msgid "The LDAP attribute to use to generate the user`s ownCloud name." +msgstr "" + +#: templates/settings.php:32 +msgid "Group Display Name Field" +msgstr "" + +#: templates/settings.php:32 +msgid "The LDAP attribute to use to generate the groups`s ownCloud name." +msgstr "" + +#: templates/settings.php:34 +msgid "in bytes" +msgstr "" + +#: templates/settings.php:36 +msgid "in seconds. A change empties the cache." +msgstr "" + +#: templates/settings.php:37 +msgid "" +"Leave empty for user name (default). Otherwise, specify an LDAP/AD " +"attribute." +msgstr "" + +#: templates/settings.php:39 +msgid "Help" +msgstr "" diff --git a/l10n/hu/user_webdavauth.po b/l10n/hu/user_webdavauth.po new file mode 100644 index 00000000000..d6235e0472c --- /dev/null +++ b/l10n/hu/user_webdavauth.po @@ -0,0 +1,29 @@ +# 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-01-03 00:04+0100\n" +"PO-Revision-Date: 2012-11-09 09:06+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: templates/settings.php:4 +msgid "URL: http://" +msgstr "" + +#: templates/settings.php:6 +msgid "" +"ownCloud will send the user credentials to this URL is interpret http 401 " +"and http 403 as credentials wrong and all other codes as credentials " +"correct." +msgstr "" diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po index 3018d56bd26..5318d06fed8 100644 --- a/l10n/pt_PT/settings.po +++ b/l10n/pt_PT/settings.po @@ -4,7 +4,7 @@ # # Translators: # , 2012. -# Duarte Velez Grilo , 2012. +# Duarte Velez Grilo , 2012-2013. # , 2012. # Helder Meneses , 2012. # , 2012. @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-30 00:04+0100\n" -"PO-Revision-Date: 2012-12-29 23:05+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-01-03 00:04+0100\n" +"PO-Revision-Date: 2013-01-02 14:00+0000\n" +"Last-Translator: Duarte Velez Grilo \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -249,11 +249,11 @@ msgstr "Criar" #: templates/users.php:35 msgid "Default Storage" -msgstr "" +msgstr "Armazenamento Padrão" #: templates/users.php:42 templates/users.php:138 msgid "Unlimited" -msgstr "" +msgstr "Ilimitado" #: templates/users.php:60 templates/users.php:153 msgid "Other" @@ -265,11 +265,11 @@ msgstr "Grupo Administrador" #: templates/users.php:87 msgid "Storage" -msgstr "" +msgstr "Armazenamento" #: templates/users.php:133 msgid "Default" -msgstr "" +msgstr "Padrão" #: templates/users.php:161 msgid "Delete" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index cef594b830d..ebbad65c865 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-02 00:04+0100\n" +"POT-Creation-Date: 2013-01-03 00:04+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.pot b/l10n/templates/files.pot index 79fd8f71c43..2d7b4687cca 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-02 00:04+0100\n" +"POT-Creation-Date: 2013-01-03 00:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -191,27 +191,27 @@ msgstr "" msgid "Maximum upload size" msgstr "" -#: templates/admin.php:9 +#: templates/admin.php:10 msgid "max. possible: " msgstr "" -#: templates/admin.php:12 +#: templates/admin.php:15 msgid "Needed for multi-file and folder downloads." msgstr "" -#: templates/admin.php:14 +#: templates/admin.php:17 msgid "Enable ZIP-download" msgstr "" -#: templates/admin.php:17 +#: templates/admin.php:20 msgid "0 is unlimited" msgstr "" -#: templates/admin.php:19 +#: templates/admin.php:22 msgid "Maximum input size for ZIP files" msgstr "" -#: templates/admin.php:23 +#: templates/admin.php:26 msgid "Save" msgstr "" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 46f22de7109..d81bb73f7eb 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-02 00:04+0100\n" +"POT-Creation-Date: 2013-01-03 00:04+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 ec95612f537..33dc2ce30a4 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-02 00:04+0100\n" +"POT-Creation-Date: 2013-01-03 00:04+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 6c6ad0096eb..53424eaed43 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-02 00:04+0100\n" +"POT-Creation-Date: 2013-01-03 00:04+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_versions.pot b/l10n/templates/files_versions.pot index 659868c67a0..c25ceb6168c 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-02 00:04+0100\n" +"POT-Creation-Date: 2013-01-03 00:04+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 700a7cf8518..c03c9cf3914 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-02 00:04+0100\n" +"POT-Creation-Date: 2013-01-03 00:04+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 51c00a79705..d06767eaf18 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-02 00:04+0100\n" +"POT-Creation-Date: 2013-01-03 00:04+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 257fcae7736..5be5f11d71d 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-02 00:04+0100\n" +"POT-Creation-Date: 2013-01-03 00:04+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 6a401044dae..25ff49007c5 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-02 00:04+0100\n" +"POT-Creation-Date: 2013-01-03 00:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/lib/l10n/bn_BD.php b/lib/l10n/bn_BD.php new file mode 100644 index 00000000000..275d3c0f05c --- /dev/null +++ b/lib/l10n/bn_BD.php @@ -0,0 +1,18 @@ + "সহায়িকা", +"Personal" => "ব্যক্তিগত", +"Settings" => "নিয়ামকসমূহ", +"Users" => "ব্যবহারকারিবৃন্দ", +"Apps" => "অ্যাপস", +"Admin" => "প্রশাসক", +"Authentication error" => "নিশ্চিতকরণে সমস্যা দেখা দিয়েছে", +"Files" => "ফাইল", +"seconds ago" => "সেকেন্ড পূর্বে", +"1 minute ago" => "1 মিনিট পূর্বে", +"1 hour ago" => "1 ঘন্টা পূর্বে", +"today" => "আজ", +"yesterday" => "গতকাল", +"last month" => "গতমাস", +"last year" => "গত বছর", +"years ago" => "বছর পূর্বে" +); diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php new file mode 100644 index 00000000000..0b7983c6c1c --- /dev/null +++ b/settings/l10n/bn_BD.php @@ -0,0 +1,46 @@ + "অ্যাপস্টোর থেকে তালিকা লোড করা সম্ভব হলো না", +"Group already exists" => "গোষ্ঠীটি বিদ্যমান", +"Unable to add group" => "গোষ্ঠী যোগ করতে পারা গেল না", +"Could not enable app. " => "অ্যাপ সক্রিয় করা সম্ভব হলো না", +"Email saved" => "ই-মেইল সংরক্ষণ করা হয়েছে", +"Invalid email" => "ই-মেইলটি সঠিক নয়", +"OpenID Changed" => "OpenID পরিবর্তন করা হয়েছে", +"Invalid request" => "অননুমোদিত অনুরোধ", +"Unable to delete group" => "গোষ্ঠী মুছে ফেলা সম্ভব হলো না", +"Authentication error" => "নিশ্চিতকরণে সমস্যা দেখা দিয়েছে", +"Unable to delete user" => "ব্যবহারকারি মুছে ফেলা সম্ভব হলো না", +"Language changed" => "ভাষা পরিবর্তন করা হয়েছে", +"Disable" => "নিষ্ক্রিয়", +"Enable" => "সক্রিয়", +"Saving..." => "সংরক্ষণ করা হচ্ছে....", +"__language_name__" => "_ভাষার_নাম_", +"Add your App" => "আপনার অ্যাপটি যোগ করুন", +"More Apps" => "আরও অ্যাপ", +"Select an App" => "অ্যাপ নির্বাচন করুন", +"See application page at apps.owncloud.com" => "অ্যাপ্লিকেসন পাতাটি দেখুন এখানে apps.owncloud.com", +"-licensed by " => "-লাইসেন্স করিয়েছেন ", +"Forum" => "ফোরাম", +"Bugtracker" => "বাগট্র্যাকার", +"Commercial Support" => "বাণিজ্যিক সাপোর্ট", +"Clients" => "ক্লায়েন্ট", +"Download Desktop Clients" => "ডেস্কটপ ক্লায়েন্ট ডাউনলোড করুন", +"Password" => "কূটশব্দ", +"Your password was changed" => "আপনার কূটশব্দটি পরিবর্তন করা হয়েছে", +"Unable to change your password" => "কূটশব্দ পরিবর্তন করা সম্ভব হলো না", +"Current password" => "বর্তমান কূটশব্দ", +"New password" => "নতুন কূটশব্দ", +"show" => "প্রদর্শন", +"Change password" => "কূটশব্দ পরিবর্তন কর", +"Email" => "ই-মেইল", +"Your email address" => "আপনার ই-মেইল ঠিকানা", +"Language" => "ভাষা", +"Help translate" => "অনুবাদ করতে সাহায্য করুন", +"Developed by the ownCloud community, the source code is licensed under the AGPL." => "তৈরি করেছেন ownCloud community, যার উৎস কোড AGPLএর অধীনে লাইেসন্সকৃত.", +"Name" => "নাম", +"Groups" => "গোষ্ঠী", +"Create" => "তৈরি কর", +"Other" => "অন্যান্য", +"Group Admin" => "গোষ্ঠী প্রশাসন", +"Delete" => "মুছে ফেল" +); diff --git a/settings/l10n/da.php b/settings/l10n/da.php index 2300b98a2bf..7800bcfb6c4 100644 --- a/settings/l10n/da.php +++ b/settings/l10n/da.php @@ -53,7 +53,11 @@ "Name" => "Navn", "Groups" => "Grupper", "Create" => "Ny", +"Default Storage" => "Standard opbevaring", +"Unlimited" => "Ubegrænset", "Other" => "Andet", "Group Admin" => "Gruppe Administrator", +"Storage" => "Opbevaring", +"Default" => "Standard", "Delete" => "Slet" ); diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php index 1cfa991464f..32764a9cf36 100644 --- a/settings/l10n/pt_PT.php +++ b/settings/l10n/pt_PT.php @@ -53,7 +53,11 @@ "Name" => "Nome", "Groups" => "Grupos", "Create" => "Criar", +"Default Storage" => "Armazenamento Padrão", +"Unlimited" => "Ilimitado", "Other" => "Outro", "Group Admin" => "Grupo Administrador", +"Storage" => "Armazenamento", +"Default" => "Padrão", "Delete" => "Apagar" ); -- cgit v1.2.3 From 34e5cb5070a36f2462cf53b7c64c68931dd68d45 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Wed, 2 Jan 2013 23:02:38 +0100 Subject: fixing indent --- lib/util.php | 188 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 94 insertions(+), 94 deletions(-) (limited to 'lib') diff --git a/lib/util.php b/lib/util.php index 98f0d053e32..7b1de094ead 100755 --- a/lib/util.php +++ b/lib/util.php @@ -111,7 +111,7 @@ class OC_Util { * @return string */ public static function getEditionString() { - return ''; + return ''; } /** @@ -311,14 +311,14 @@ class OC_Util { if (isset($_REQUEST['redirect_url'])) { $redirect_url = OC_Util::sanitizeHTML($_REQUEST['redirect_url']); $parameters['redirect_url'] = urlencode($redirect_url); - } + } OC_Template::printGuestPage("", "login", $parameters); } /** - * Check if the app is enabled, redirects to home if not - */ + * Check if the app is enabled, redirects to home if not + */ public static function checkAppEnabled($app) { if( !OC_App::isEnabled($app)) { header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' )); @@ -327,9 +327,9 @@ class OC_Util { } /** - * Check if the user is logged in, redirects to home if not. With - * redirect URL parameter to the request URI. - */ + * Check if the user is logged in, redirects to home if not. With + * redirect URL parameter to the request URI. + */ public static function checkLoggedIn() { // Check if we are a user if( !OC_User::isLoggedIn()) { @@ -339,8 +339,8 @@ class OC_Util { } /** - * Check if the user is a admin, redirects to home if not - */ + * Check if the user is a admin, redirects to home if not + */ public static function checkAdminUser() { // Check if we are a user self::checkLoggedIn(); @@ -352,9 +352,9 @@ class OC_Util { } /** - * Check if the user is a subadmin, redirects to home if not - * @return array $groups where the current user is subadmin - */ + * Check if the user is a subadmin, redirects to home if not + * @return array $groups where the current user is subadmin + */ public static function checkSubAdminUser() { // Check if we are a user self::checkLoggedIn(); @@ -370,19 +370,19 @@ class OC_Util { } /** - * Check if the user verified the login with his password in the last 15 minutes - * If not, the user will be shown a password verification page - */ + * Check if the user verified the login with his password in the last 15 minutes + * If not, the user will be shown a password verification page + */ public static function verifyUser() { if(OC_Config::getValue('enhancedauth', false) === true) { - // Check password to set session + // Check password to set session if(isset($_POST['password'])) { if (OC_User::login(OC_User::getUser(), $_POST["password"] ) === true) { $_SESSION['verifiedLogin']=time() + OC_Config::getValue('enhancedauthtime', 15 * 60); } } - // Check if the user verified his password + // Check if the user verified his password if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) { OC_Template::printGuestPage("", "verify", array('username' => OC_User::getUser())); exit(); @@ -391,9 +391,9 @@ class OC_Util { } /** - * Check if the user verified the login with his password - * @return bool - */ + * Check if the user verified the login with his password + * @return bool + */ public static function isUserVerified() { if(OC_Config::getValue('enhancedauth', false) === true) { if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) { @@ -404,8 +404,8 @@ class OC_Util { } /** - * Redirect to the user default page - */ + * Redirect to the user default page + */ public static function redirectToDefaultPage() { if(isset($_REQUEST['redirect_url'])) { $location = OC_Helper::makeURLAbsolute(urldecode($_REQUEST['redirect_url'])); @@ -553,9 +553,9 @@ class OC_Util { } - /** - * Check if the setlocal call doesn't work. This can happen if the right local packages are not available on the server. - */ + /** + * Check if the setlocal call doesn't work. This can happen if the right local packages are not available on the server. + */ public static function issetlocaleworking() { $result=setlocale(LC_ALL, 'en_US.UTF-8'); if($result==false) { @@ -565,20 +565,20 @@ class OC_Util { } } - /** - * Check if the ownCloud server can connect to the internet - */ + /** + * Check if the ownCloud server can connect to the internet + */ public static function isinternetconnectionworking() { // try to connect to owncloud.org to see if http connections to the internet are possible. - $connected = @fsockopen("www.owncloud.org", 80); + $connected = @fsockopen("www.owncloud.org", 80); if ($connected) { fclose($connected); return true; }else{ // second try in case one server is down - $connected = @fsockopen("apps.owncloud.com", 80); + $connected = @fsockopen("apps.owncloud.com", 80); if ($connected) { fclose($connected); return true; @@ -601,11 +601,11 @@ class OC_Util { /** - * @brief Generates a cryptographical secure pseudorandom string - * @param Int with the length of the random string - * @return String - * Please also update secureRNG_available if you change something here - */ + * @brief Generates a cryptographical secure pseudorandom string + * @param Int with the length of the random string + * @return String + * Please also update secureRNG_available if you change something here + */ public static function generate_random_bytes($length = 30) { // Try to use openssl_random_pseudo_bytes @@ -637,9 +637,9 @@ class OC_Util { } /** - * @brief Checks if a secure random number generator is available - * @return bool - */ + * @brief Checks if a secure random number generator is available + * @return bool + */ public static function secureRNG_available() { // Check openssl_random_pseudo_bytes @@ -658,61 +658,61 @@ class OC_Util { return false; } - - /** - * @Brief Get file content via curl. - * @param string $url Url to get content - * @return string of the response or false on error - * This function get the content of a page via curl, if curl is enabled. - * If not, file_get_element is used. - */ - - public static function getUrlContent($url){ - - if (function_exists('curl_init')) { - - $curl = curl_init(); - - curl_setopt($curl, CURLOPT_HEADER, 0); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 10); - curl_setopt($curl, CURLOPT_URL, $url); - curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler"); - if(OC_Config::getValue('proxy','')<>'') { - curl_setopt($curl, CURLOPT_PROXY, OC_Config::getValue('proxy')); - } - if(OC_Config::getValue('proxyuserpwd','')<>'') { - curl_setopt($curl, CURLOPT_PROXYUSERPWD, OC_Config::getValue('proxyuserpwd')); - } - $data = curl_exec($curl); - curl_close($curl); - - } else { - $contextArray = null; - - if(OC_Config::getValue('proxy','')<>'') { - $contextArray = array( - 'http' => array( - 'timeout' => 10, - 'proxy' => OC_Config::getValue('proxy') - ) - ); - } else { - $contextArray = array( - 'http' => array( - 'timeout' => 10 - ) - ); - } - - - $ctx = stream_context_create( - $contextArray - ); - $data=@file_get_contents($url, 0, $ctx); - - } - return $data; + + /** + * @Brief Get file content via curl. + * @param string $url Url to get content + * @return string of the response or false on error + * This function get the content of a page via curl, if curl is enabled. + * If not, file_get_element is used. + */ + + public static function getUrlContent($url){ + + if (function_exists('curl_init')) { + + $curl = curl_init(); + + curl_setopt($curl, CURLOPT_HEADER, 0); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 10); + curl_setopt($curl, CURLOPT_URL, $url); + curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler"); + if(OC_Config::getValue('proxy','')<>'') { + curl_setopt($curl, CURLOPT_PROXY, OC_Config::getValue('proxy')); + } + if(OC_Config::getValue('proxyuserpwd','')<>'') { + curl_setopt($curl, CURLOPT_PROXYUSERPWD, OC_Config::getValue('proxyuserpwd')); + } + $data = curl_exec($curl); + curl_close($curl); + + } else { + $contextArray = null; + + if(OC_Config::getValue('proxy','')<>'') { + $contextArray = array( + 'http' => array( + 'timeout' => 10, + 'proxy' => OC_Config::getValue('proxy') + ) + ); + } else { + $contextArray = array( + 'http' => array( + 'timeout' => 10 + ) + ); + } + + + $ctx = stream_context_create( + $contextArray + ); + $data=@file_get_contents($url, 0, $ctx); + + } + return $data; } - + } -- cgit v1.2.3 From 045c0acc92a291d5bc785103e129516f99032f94 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Thu, 3 Jan 2013 00:35:57 +0100 Subject: workaround for 32-bit systems to handle filesizes bigger than 2GB --- lib/filestorage.php | 2 +- lib/filestorage/local.php | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/filestorage.php b/lib/filestorage.php index dd65f4421b7..2e03c4cb6da 100644 --- a/lib/filestorage.php +++ b/lib/filestorage.php @@ -21,7 +21,7 @@ */ /** - * Provde a common interface to all different storage options + * Provide a common interface to all different storage options */ abstract class OC_Filestorage{ abstract public function __construct($parameters); diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php index 6fe45acf8c5..0bf6ad2d3d7 100644 --- a/lib/filestorage/local.php +++ b/lib/filestorage/local.php @@ -29,7 +29,24 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ return is_file($this->datadir.$path); } public function stat($path) { - return stat($this->datadir.$path); + $fullPath = $this->datadir.$path; + $statResult = stat($fullPath); + + // special case for 32-bit systems + if (PHP_INT_SIZE===4) { + if (!(strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')) + $size = (float)exec('stat -c %s '. escapeshellarg ($fullPath)); + else{ + $fsobj = new COM("Scripting.FileSystemObject"); + $f = $fsobj->GetFile($fullPath); + $size = $f->Size; + } + + $statResult['size'] = $size; + $statResult[7] = $size; + } + + return $statResult; } public function filetype($path) { $filetype=filetype($this->datadir.$path); -- cgit v1.2.3 From ce443818d4a54c2f1d2d058c5cf2347e470d0d46 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Wed, 2 Jan 2013 19:59:04 -0500 Subject: Check if oc_token cookie exists before trying to use it --- lib/base.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/base.php b/lib/base.php index 94fb7979620..ef203b33c2b 100644 --- a/lib/base.php +++ b/lib/base.php @@ -557,7 +557,9 @@ class OC OC_App::loadApps(); OC_User::setupBackends(); if (isset($_GET["logout"]) and ($_GET["logout"])) { - OC_Preferences::deleteKey(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']); + if (isset($_COOKIE['oc_token'])) { + OC_Preferences::deleteKey(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']); + } OC_User::logout(); header("Location: " . OC::$WEBROOT . '/'); } else { -- cgit v1.2.3 From a52aa69ffe5f6d00de7855c9a376f347c03b99f7 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Thu, 3 Jan 2013 14:11:00 -0500 Subject: Rearrange code to prepare for updater feedback --- lib/base.php | 100 +++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 63 insertions(+), 37 deletions(-) (limited to 'lib') diff --git a/lib/base.php b/lib/base.php index ef203b33c2b..eaef984df34 100644 --- a/lib/base.php +++ b/lib/base.php @@ -193,6 +193,15 @@ class OC ); } + public static function checkConfig() { + if (file_exists(OC::$SERVERROOT . "/config/config.php") and !is_writable(OC::$SERVERROOT . "/config/config.php")) { + $tmpl = new OC_Template('', 'error', 'guest'); + $tmpl->assign('errors', array(1 => array('error' => "Can't write into config directory 'config'", 'hint' => "You can usually fix this by giving the webserver user write access to the config directory in owncloud"))); + $tmpl->printPage(); + exit(); + } + } + public static function checkInstalled() { // Redirect to installer if not installed @@ -219,43 +228,58 @@ class OC } } - public static function checkUpgrade() - { - if (OC_Config::getValue('installed', false)) { - $installedVersion = OC_Config::getValue('version', '0.0.0'); - $currentVersion = implode('.', OC_Util::getVersion()); - if (version_compare($currentVersion, $installedVersion, '>')) { - // Check if the .htaccess is existing - this is needed for upgrades from really old ownCloud versions - if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) { - if (!OC_Util::ishtaccessworking()) { - if (!file_exists(OC::$SERVERROOT . '/data/.htaccess')) { - OC_Setup::protectDataDirectory(); - } - } - } - OC_Log::write('core', 'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, OC_Log::DEBUG); - $result = OC_DB::updateDbFromStructure(OC::$SERVERROOT . '/db_structure.xml'); - if (!$result) { - echo 'Error while upgrading the database'; - die(); - } - if (file_exists(OC::$SERVERROOT . "/config/config.php") and !is_writable(OC::$SERVERROOT . "/config/config.php")) { - $tmpl = new OC_Template('', 'error', 'guest'); - $tmpl->assign('errors', array(1 => array('error' => "Can't write into config directory 'config'", 'hint' => "You can usually fix this by giving the webserver user write access to the config directory in owncloud"))); - $tmpl->printPage(); - exit; - } - $minimizerCSS = new OC_Minimizer_CSS(); - $minimizerCSS->clearCache(); - $minimizerJS = new OC_Minimizer_JS(); - $minimizerJS->clearCache(); - OC_Config::setValue('version', implode('.', OC_Util::getVersion())); - OC_App::checkAppsRequirements(); - // load all apps to also upgrade enabled apps - OC_App::loadApps(); - } - } - } + public static function checkMaintenanceMode() { + if (OC_Config::getValue('maintenance', false)) { + $tmpl = new OC_Template('', 'error', 'guest'); + $tmpl->printPage(); + exit(); + } + } + + public static function checkUpgrade($showTemplate = true) { + if (OC_Config::getValue('installed', false)) { + $installedVersion = OC_Config::getValue('version', '0.0.0'); + $currentVersion = implode('.', OC_Util::getVersion()); + if (version_compare($currentVersion, $installedVersion, '>')) { + if ($showTemplate) { + OC_Log::write('core', 'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, OC_Log::DEBUG); + $tmpl = new OC_Template('', 'error', 'guest'); + $tmpl->printPage(); + exit(); + } else { + return true; + } + } + return false; + } + } + + public static function doUpgrade() { + if (self::checkUpgrade(false)) { + OC_Config::setValue('maintenance', true); + // Check if the .htaccess is existing - this is needed for upgrades from really old ownCloud versions + if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) { + if (!OC_Util::ishtaccessworking()) { + if (!file_exists(OC::$SERVERROOT . '/data/.htaccess')) { + OC_Setup::protectDataDirectory(); + } + } + } + $result = OC_DB::updateDbFromStructure(OC::$SERVERROOT . '/db_structure.xml'); + if (!$result) { + echo 'Error while upgrading the database'; + die(); + } + $minimizerCSS = new OC_Minimizer_CSS(); + $minimizerCSS->clearCache(); + $minimizerJS = new OC_Minimizer_JS(); + $minimizerJS->clearCache(); + OC_Config::setValue('version', implode('.', OC_Util::getVersion())); + OC_App::checkAppsRequirements(); + // load all apps to also upgrade enabled apps + OC_App::loadApps(); + } + } public static function initTemplateEngine() { @@ -403,10 +427,12 @@ class OC stream_wrapper_register('static', 'OC_StaticStreamWrapper'); stream_wrapper_register('close', 'OC_CloseStreamWrapper'); + self::checkConfig(); self::checkInstalled(); self::checkSSL(); self::initSession(); self::initTemplateEngine(); + self::checkMaintenanceMode(); self::checkUpgrade(); $errors = OC_Util::checkServer(); -- cgit v1.2.3 From 75058370795fda4f06f589ee970edf94dc0ddf88 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Thu, 3 Jan 2013 21:32:33 -0500 Subject: Basic update progress of database update only --- core/ajax/update.php | 36 ++++++++++++++++++++++++++++++++++ core/css/styles.css | 3 ++- core/templates/update.php | 27 ++++++++++++++++++++++++++ lib/base.php | 49 ++++++++++++----------------------------------- 4 files changed, 77 insertions(+), 38 deletions(-) create mode 100644 core/ajax/update.php create mode 100644 core/templates/update.php (limited to 'lib') diff --git a/core/ajax/update.php b/core/ajax/update.php new file mode 100644 index 00000000000..6f5398f41cb --- /dev/null +++ b/core/ajax/update.php @@ -0,0 +1,36 @@ +send('success', 'Turned on maintenance mode'); + // Check if the .htaccess is existing - this is needed for upgrades from really old ownCloud versions + if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) { + if (!OC_Util::ishtaccessworking()) { + if (!file_exists(OC::$SERVERROOT . '/data/.htaccess')) { + OC_Setup::protectDataDirectory(); + } + } + } + $result = OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/db_structure.xml'); + if (!$result) { + $updateEventSource->send('failure', 'Error updating database'); + $updateEventSource->close(); + die(); + } + $updateEventSource->send('success', 'Updated database'); + $minimizerCSS = new OC_Minimizer_CSS(); + $minimizerCSS->clearCache(); + $minimizerJS = new OC_Minimizer_JS(); + $minimizerJS->clearCache(); + OC_Config::setValue('version', implode('.', OC_Util::getVersion())); + OC_App::checkAppsRequirements(); + // load all apps to also upgrade enabled apps + OC_App::loadApps(); + OC_Config::setValue('maintenance', false); + $updateEventSource->send('success', 'Turned off maintenance mode'); + $updateEventSource->send('done', 'done'); + $updateEventSource->close(); +} \ No newline at end of file diff --git a/core/css/styles.css b/core/css/styles.css index d635916b5ae..6e1cef72eda 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -214,7 +214,8 @@ div.jp-play-bar, div.jp-seek-bar { padding:0; } .pager { list-style:none; float:right; display:inline; margin:.7em 13em 0 0; } .pager li { display:inline-block; } -li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; color:#FF3B3B; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; } +li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; cursor:default; } +.error { color:#FF3B3B; } .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { overflow:hidden; text-overflow:ellipsis; } .hint { background-image:url('../img/actions/info.png'); background-repeat:no-repeat; color:#777777; padding-left:25px; background-position:0 0.3em;} .separator { display:inline; border-left:1px solid #d3d3d3; border-right:1px solid #fff; height:10px; width:0px; margin:4px; } diff --git a/core/templates/update.php b/core/templates/update.php new file mode 100644 index 00000000000..cf3f2ab0d79 --- /dev/null +++ b/core/templates/update.php @@ -0,0 +1,27 @@ +
    +
  • + t('Updating ownCloud from version %s to version %s, this may take a while.', array($_['installed'], $_['current'])); ?>

    +
    • +
+ \ No newline at end of file diff --git a/lib/base.php b/lib/base.php index eaef984df34..ec08ccc67be 100644 --- a/lib/base.php +++ b/lib/base.php @@ -229,8 +229,10 @@ class OC } public static function checkMaintenanceMode() { - if (OC_Config::getValue('maintenance', false)) { + // Allow ajax update script to execute without being stopped + if (OC_Config::getValue('maintenance', false) && OC::$SUBURI != '/core/ajax/update.php') { $tmpl = new OC_Template('', 'error', 'guest'); + $tmpl->assign('errors', array(1 => array('error' => 'ownCloud is in maintenance mode'))); $tmpl->printPage(); exit(); } @@ -241,9 +243,12 @@ class OC $installedVersion = OC_Config::getValue('version', '0.0.0'); $currentVersion = implode('.', OC_Util::getVersion()); if (version_compare($currentVersion, $installedVersion, '>')) { - if ($showTemplate) { + if ($showTemplate && !OC_Config::getValue('maintenance', false)) { + OC_Config::setValue('maintenance', true); OC_Log::write('core', 'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, OC_Log::DEBUG); - $tmpl = new OC_Template('', 'error', 'guest'); + $tmpl = new OC_Template('', 'update', 'guest'); + $tmpl->assign('current', $currentVersion); + $tmpl->assign('installed', $installedVersion); $tmpl->printPage(); exit(); } else { @@ -254,33 +259,6 @@ class OC } } - public static function doUpgrade() { - if (self::checkUpgrade(false)) { - OC_Config::setValue('maintenance', true); - // Check if the .htaccess is existing - this is needed for upgrades from really old ownCloud versions - if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) { - if (!OC_Util::ishtaccessworking()) { - if (!file_exists(OC::$SERVERROOT . '/data/.htaccess')) { - OC_Setup::protectDataDirectory(); - } - } - } - $result = OC_DB::updateDbFromStructure(OC::$SERVERROOT . '/db_structure.xml'); - if (!$result) { - echo 'Error while upgrading the database'; - die(); - } - $minimizerCSS = new OC_Minimizer_CSS(); - $minimizerCSS->clearCache(); - $minimizerJS = new OC_Minimizer_JS(); - $minimizerJS->clearCache(); - OC_Config::setValue('version', implode('.', OC_Util::getVersion())); - OC_App::checkAppsRequirements(); - // load all apps to also upgrade enabled apps - OC_App::loadApps(); - } - } - public static function initTemplateEngine() { // Add the stuff we need always @@ -297,12 +275,6 @@ class OC OC_Util::addScript('search', 'result'); OC_Util::addScript('router'); - if (OC_Config::getValue('installed', false)) { - if (OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') { - OC_Util::addScript('backgroundjobs'); - } - } - OC_Util::addStyle("styles"); OC_Util::addStyle("multiselect"); OC_Util::addStyle("jquery-ui-1.8.16.custom"); @@ -433,7 +405,7 @@ class OC self::initSession(); self::initTemplateEngine(); self::checkMaintenanceMode(); - self::checkUpgrade(); + self::checkUpgrade(); $errors = OC_Util::checkServer(); if (count($errors) > 0) { @@ -508,6 +480,9 @@ class OC if (OC_Util::issetlocaleworking() == false) { OC_Log::write('core', 'setting locate to en_US.UTF-8 failed. Support is probably not installed on your system', OC_Log::ERROR); } + if (OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') { + OC_Util::addScript('backgroundjobs'); + } } /** -- cgit v1.2.3 From e7eea3dd2e3eb0f5bd77901167656275d835cfb3 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Fri, 4 Jan 2013 10:21:33 -0500 Subject: Use hooks to send updates from apps --- core/ajax/update.php | 54 ++++++++++++++++++++++++++++++++++++++++++++-------- lib/app.php | 1 + 2 files changed, 47 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/core/ajax/update.php b/core/ajax/update.php index 6f5398f41cb..0d58f17f097 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -5,7 +5,11 @@ require_once '../../lib/base.php'; if (OC::checkUpgrade(false)) { $updateEventSource = new OC_EventSource(); - $updateEventSource->send('success', 'Turned on maintenance mode'); + $watcher = new UpdateWatcher($updateEventSource); + OC_Hook::connect('update', 'success', $watcher, 'success'); + OC_Hook::connect('update', 'error', $watcher, 'error'); + OC_Hook::connect('update', 'error', $watcher, 'failure'); + $watcher->success('Turned on maintenance mode'); // Check if the .htaccess is existing - this is needed for upgrades from really old ownCloud versions if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) { if (!OC_Util::ishtaccessworking()) { @@ -16,11 +20,9 @@ if (OC::checkUpgrade(false)) { } $result = OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/db_structure.xml'); if (!$result) { - $updateEventSource->send('failure', 'Error updating database'); - $updateEventSource->close(); - die(); + $watcher->failure('Error updating database'); } - $updateEventSource->send('success', 'Updated database'); + $watcher->success('Updated database'); $minimizerCSS = new OC_Minimizer_CSS(); $minimizerCSS->clearCache(); $minimizerJS = new OC_Minimizer_JS(); @@ -30,7 +32,43 @@ if (OC::checkUpgrade(false)) { // load all apps to also upgrade enabled apps OC_App::loadApps(); OC_Config::setValue('maintenance', false); - $updateEventSource->send('success', 'Turned off maintenance mode'); - $updateEventSource->send('done', 'done'); - $updateEventSource->close(); + $watcher->success('Turned off maintenance mode'); + $watcher->done(); +} + +class UpdateWatcher { + /** + * @var \OC_EventSource $eventSource; + */ + private $eventSource; + + public function __construct($eventSource) { + $this->eventSource = $eventSource; + } + + public function success($message) { + OC_Util::obEnd(); + $this->eventSource->send('success', $message); + ob_start(); + } + + public function error($message) { + OC_Util::obEnd(); + $this->eventSource->send('error', $message); + ob_start(); + } + + public function failure($message) { + OC_Util::obEnd(); + $this->eventSource->send('failure', $message); + $this->eventSource->close(); + die(); + } + + public function done() { + OC_Util::obEnd(); + $this->eventSource->send('done', ''); + $this->eventSource->close(); + } + } \ No newline at end of file diff --git a/lib/app.php b/lib/app.php index be6d5ab3dd3..596f3bf3a79 100755 --- a/lib/app.php +++ b/lib/app.php @@ -642,6 +642,7 @@ class OC_App{ echo 'Failed to upgrade "'.$app.'". Exception="'.$e->getMessage().'"'; die; } + OC_Hook::emit('update', 'success', 'Updated '.$app.' app'); OC_Appconfig::setValue($app, 'installed_version', OC_App::getAppVersion($app)); } } -- cgit v1.2.3 From f2e6df807d05ef50b28ca2afc9ea51970ec0d87b Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Fri, 4 Jan 2013 14:16:59 -0500 Subject: Add back check if installed around background jobs --- lib/base.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/base.php b/lib/base.php index ec08ccc67be..e6355013c73 100644 --- a/lib/base.php +++ b/lib/base.php @@ -480,8 +480,10 @@ class OC if (OC_Util::issetlocaleworking() == false) { OC_Log::write('core', 'setting locate to en_US.UTF-8 failed. Support is probably not installed on your system', OC_Log::ERROR); } - if (OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') { - OC_Util::addScript('backgroundjobs'); + if (OC_Config::getValue('installed', false)) { + if (OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') { + OC_Util::addScript('backgroundjobs'); + } } } -- cgit v1.2.3 From dfc8d757b5dd7e5d7bf54a32b9f11f0798905d4a Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Fri, 4 Jan 2013 23:00:51 +0100 Subject: OC_Helper::is_function_enabled() added to find out if a function is available And some documentation adjusted on the way --- lib/helper.php | 61 +++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 18 deletions(-) (limited to 'lib') diff --git a/lib/helper.php b/lib/helper.php index be4e4e52677..1aba2a38100 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -31,8 +31,9 @@ class OC_Helper { /** * @brief Creates an url using a defined route * @param $route - * @param $parameters - * @param $args array with param=>value, will be appended to the returned url + * @param array $parameters + * @return + * @internal param array $args with param=>value, will be appended to the returned url * @returns the url * * Returns a url to the given app and file. @@ -128,6 +129,7 @@ class OC_Helper { /** * @brief Creates an absolute url for remote use * @param string $service id + * @param bool $add_slash * @return string the url * * Returns a absolute url to the given service. @@ -139,6 +141,7 @@ class OC_Helper { /** * @brief Creates an absolute url for public use * @param string $service id + * @param bool $add_slash * @return string the url * * Returns a absolute url to the given service. @@ -450,12 +453,14 @@ class OC_Helper { } /** - * detect if a given program is found in the search PATH - * - * @param string $program name - * @param string $optional search path, defaults to $PATH - * @return bool true if executable program found in path - */ + * detect if a given program is found in the search PATH + * + * @param $name + * @param bool $path + * @internal param string $program name + * @internal param string $optional search path, defaults to $PATH + * @return bool true if executable program found in path + */ public static function canExecute($name, $path = false) { // path defaults to PATH from environment if not set if ($path === false) { @@ -676,16 +681,16 @@ class OC_Helper { } /** - * @brief replaces a copy of string delimited by the start and (optionally) length parameters with the string given in replacement. - * - * @param string $input The input string. .Opposite to the PHP build-in function does not accept an array. - * @param string $replacement The replacement string. - * @param int $start If start is positive, the replacing will begin at the start'th offset into string. If start is negative, the replacing will begin at the start'th character from the end of string. - * @param int $length Length of the part to be replaced - * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8 - * @return string - * - */ + * @brief replaces a copy of string delimited by the start and (optionally) length parameters with the string given in replacement. + * + * @param $string + * @param string $replacement The replacement string. + * @param int $start If start is positive, the replacing will begin at the start'th offset into string. If start is negative, the replacing will begin at the start'th character from the end of string. + * @param int $length Length of the part to be replaced + * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8 + * @internal param string $input The input string. .Opposite to the PHP build-in function does not accept an array. + * @return string + */ public static function mb_substr_replace($string, $replacement, $start, $length = null, $encoding = 'UTF-8') { $start = intval($start); $length = intval($length); @@ -758,4 +763,24 @@ class OC_Helper { } return $str; } + + /** + * Checks if a function is available + * @param string $function_name + * @return bool + */ + public static function is_function_enabled($function_name) { + if (!function_exists($function_name)) { + return false; + } + $disabled = explode(', ', ini_get('disable_functions')); + if (in_array($function_name, $disabled)) { + return false; + } + $disabled = explode(', ', ini_get('suhosin.executor.func.blacklist')); + if (in_array($function_name, $disabled)) { + return false; + } + return true; + } } -- cgit v1.2.3 From cedec593ee32d7e8b988c9df7c08020df52dbdb3 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Fri, 4 Jan 2013 23:03:26 +0100 Subject: Fallback to use COM or exec('stat ..') is only executed if stat or filesize return negative values. Special case of BSD has been added as stat syntax differs In addition unknown OS is logged --- lib/filestorage/local.php | 47 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 12 deletions(-) (limited to 'lib') diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php index 0bf6ad2d3d7..435fcb692a3 100644 --- a/lib/filestorage/local.php +++ b/lib/filestorage/local.php @@ -29,22 +29,15 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ return is_file($this->datadir.$path); } public function stat($path) { - $fullPath = $this->datadir.$path; + $fullPath = $this->datadir . $path; $statResult = stat($fullPath); - // special case for 32-bit systems - if (PHP_INT_SIZE===4) { - if (!(strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')) - $size = (float)exec('stat -c %s '. escapeshellarg ($fullPath)); - else{ - $fsobj = new COM("Scripting.FileSystemObject"); - $f = $fsobj->GetFile($fullPath); - $size = $f->Size; - } - + if ($statResult['size'] < 0) { + $size = self::getFileSizeFromOS($fullPath); $statResult['size'] = $size; $statResult[7] = $size; } + return $statResult; return $statResult; } @@ -59,7 +52,13 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ if($this->is_dir($path)) { return 0; }else{ - return filesize($this->datadir.$path); + $fullPath = $this->datadir . $path; + $fileSize = filesize($fullPath); + if ($fileSize < 0) { + return self::getFileSizeFromOS($fullPath); + } + + return $fileSize; } } public function isReadable($path) { @@ -173,6 +172,30 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ return $return; } + private static function getFileSizeFromOS($fullPath) { + $name = strtolower(php_uname('s')); + // Windows OS: we use COM to access the filesystem + if (strpos($name, 'win') !== false) { + if (class_exists('COM')) { + $fsobj = new COM("Scripting.FileSystemObject"); + $f = $fsobj->GetFile($fullPath); + return $f->Size; + } + } else if (strpos($name, 'bsd') !== false) { + if (\OC_Helper::is_function_enabled('exec')) { + return (float)exec('stat -f %z ' . escapeshellarg($fullPath)); + } + } else if (strpos($name, 'linux') !== false) { + if (\OC_Helper::is_function_enabled('exec')) { + return (float)exec('stat -c %s ' . escapeshellarg($fullPath)); + } + } else { + OC_Log::write('core', 'Unknown OS: '.$name, OC_Log::ERROR); + } + + return 0; + } + public function hash($path, $type, $raw=false) { return hash_file($type, $this->datadir.$path, $raw); } -- cgit v1.2.3 From ac50c2f97322cb8ac2631d092327e91758aa75de Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Fri, 4 Jan 2013 23:04:23 +0100 Subject: documentation adjusted on the way --- lib/filestorage/local.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php index 435fcb692a3..86cc910d2e1 100644 --- a/lib/filestorage/local.php +++ b/lib/filestorage/local.php @@ -230,6 +230,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ /** * check if a file or folder has been updated since $time + * @param string $path * @param int $time * @return bool */ -- cgit v1.2.3 From 2cb66327525472d1b5f287b20d81554c84c2ddbe Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Fri, 4 Jan 2013 23:44:01 +0100 Subject: enhanced log message --- lib/filestorage/local.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php index 86cc910d2e1..ca68d6b8702 100644 --- a/lib/filestorage/local.php +++ b/lib/filestorage/local.php @@ -190,7 +190,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ return (float)exec('stat -c %s ' . escapeshellarg($fullPath)); } } else { - OC_Log::write('core', 'Unknown OS: '.$name, OC_Log::ERROR); + OC_Log::write('core', 'Unable to determine file size of "'.$fullPath.'". Unknown OS: '.$name, OC_Log::ERROR); } return 0; -- cgit v1.2.3 From da28ae0069b720161deb648028b612563e5f6497 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Sat, 5 Jan 2013 00:09:37 +0100 Subject: remove duplicate return --- lib/filestorage/local.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'lib') diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php index ca68d6b8702..910b3fa039d 100644 --- a/lib/filestorage/local.php +++ b/lib/filestorage/local.php @@ -38,8 +38,6 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ $statResult[7] = $size; } return $statResult; - - return $statResult; } public function filetype($path) { $filetype=filetype($this->datadir.$path); -- cgit v1.2.3 From a94405b4e4ebbeea2f8bc3a220572dab1ae7cb3a Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Fri, 4 Jan 2013 20:13:00 -0500 Subject: Only show the version updating to instead of worrying about converting internal to a formatted version --- core/templates/update.php | 2 +- lib/base.php | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/core/templates/update.php b/core/templates/update.php index cf3f2ab0d79..41da712c6ca 100644 --- a/core/templates/update.php +++ b/core/templates/update.php @@ -1,6 +1,6 @@
  • - t('Updating ownCloud from version %s to version %s, this may take a while.', array($_['installed'], $_['current'])); ?>

    + t('Updating ownCloud to version %s, this may take a while.', array($_['version'])); ?>